From 51bf92a3cbe1fe27153baa0becae49075d9ea3b0 Mon Sep 17 00:00:00 2001
From: Ben Chan <benchan@chromium.org>
Date: Fri, 5 Sep 2014 08:21:06 -0700
Subject: [PATCH] Update code to include base/files/file_util.h

file_util.h was moved from base to base/files
(https://codereview.chromium.org/468253002). This CL updates platform2
code to include base/files/file_util.h instead of base/file_util.h.

BUG=chromium:411001
TEST=Trybot run on paladin, release, and chromiumos-sdk builders.

Change-Id: I488925b54615e131e508a460dc1a27f88168f936
Reviewed-on: https://chromium-review.googlesource.com/216851
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
---
 metrics/metrics_daemon.cc                | 2 +-
 metrics/metrics_daemon_test.cc           | 2 +-
 metrics/metrics_library_test.cc          | 2 +-
 metrics/persistent_integer_test.cc       | 2 +-
 metrics/uploader/system_profile_cache.cc | 2 +-
 metrics/uploader/upload_service_test.cc  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index 0552adb2a..07c32209d 100644
--- a/metrics/metrics_daemon.cc
+++ b/metrics/metrics_daemon.cc
@@ -14,8 +14,8 @@
 #include <string.h>
 #include <time.h>
 
-#include <base/file_util.h>
 #include <base/files/file_path.h>
+#include <base/files/file_util.h>
 #include <base/hash.h>
 #include <base/logging.h>
 #include <base/strings/string_number_conversions.h>
diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 9528e774f..0116a1934 100644
--- a/metrics/metrics_daemon_test.cc
+++ b/metrics/metrics_daemon_test.cc
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <base/at_exit.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/stringprintf.h>
 #include <chromeos/dbus/service_constants.h>
diff --git a/metrics/metrics_library_test.cc b/metrics/metrics_library_test.cc
index 7bf5c6391..7ede303c8 100644
--- a/metrics/metrics_library_test.cc
+++ b/metrics/metrics_library_test.cc
@@ -4,7 +4,7 @@
 
 #include <cstring>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <policy/mock_device_policy.h>
diff --git a/metrics/persistent_integer_test.cc b/metrics/persistent_integer_test.cc
index 097ec7da6..a56aedec9 100644
--- a/metrics/persistent_integer_test.cc
+++ b/metrics/persistent_integer_test.cc
@@ -5,8 +5,8 @@
 #include <gtest/gtest.h>
 
 #include <base/compiler_specific.h>
-#include <base/file_util.h>
 #include <base/files/file_enumerator.h>
+#include <base/files/file_util.h>
 
 #include "metrics/persistent_integer.h"
 
diff --git a/metrics/uploader/system_profile_cache.cc b/metrics/uploader/system_profile_cache.cc
index fd7996140..12e8bece3 100644
--- a/metrics/uploader/system_profile_cache.cc
+++ b/metrics/uploader/system_profile_cache.cc
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
diff --git a/metrics/uploader/upload_service_test.cc b/metrics/uploader/upload_service_test.cc
index 5076e614c..d60413d45 100644
--- a/metrics/uploader/upload_service_test.cc
+++ b/metrics/uploader/upload_service_test.cc
@@ -5,7 +5,7 @@
 #include <gtest/gtest.h>
 
 #include "base/at_exit.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/sys_info.h"