commit 51bf92a3cbe1fe27153baa0becae49075d9ea3b0
author Ben Chan <benchan@chromium.org> Fri Sep 05 08:21:06 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Sep 09 21:00:34 2014 +0000
tree 83d89f37a0186476d0db8f38cc9bea02e14f0d14
parent 37595f893f8ffbaa689d8d0a4c4dffb0593e7d5b

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

diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index 0552adb..07c3220 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>

metrics/metrics_daemon_test.cc

diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 9528e77..0116a19 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>

metrics/metrics_library_test.cc

diff --git a/metrics/metrics_library_test.cc b/metrics/metrics_library_test.cc
index 7bf5c63..7ede303 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>

metrics/persistent_integer_test.cc

diff --git a/metrics/persistent_integer_test.cc b/metrics/persistent_integer_test.cc
index 097ec7d..a56aede 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"
 

metrics/uploader/system_profile_cache.cc

diff --git a/metrics/uploader/system_profile_cache.cc b/metrics/uploader/system_profile_cache.cc
index fd79961..12e8bec 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"

metrics/uploader/upload_service_test.cc

diff --git a/metrics/uploader/upload_service_test.cc b/metrics/uploader/upload_service_test.cc
index 5076e61..d60413d 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"