summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 20:22:14 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 20:23:37 +0000
commite3177dd5063e419cb181cf6a45d3ff94cb0feebd (patch)
tree9eb2bd0b85941a0586a1a7185ed151689a0032f9 /base/json
parent7fa443fda5ddbf8e83e1967931f115f5394d16aa (diff)
downloadchromium_src-e3177dd5063e419cb181cf6a45d3ff94cb0feebd.zip
chromium_src-e3177dd5063e419cb181cf6a45d3ff94cb0feebd.tar.gz
chromium_src-e3177dd5063e419cb181cf6a45d3ff94cb0feebd.tar.bz2
Move file_util to base/files/ directory.
This updates the includes in base but leaves a forwarding header for the rest of the project for now. R=yzshen@chromium.org Review URL: https://codereview.chromium.org/468253002 Cr-Commit-Position: refs/heads/master@{#289360} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
-rw-r--r--base/json/json_file_value_serializer.cc2
-rw-r--r--base/json/json_reader_unittest.cc2
-rw-r--r--base/json/json_value_serializer_unittest.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/base/json/json_file_value_serializer.cc b/base/json/json_file_value_serializer.cc
index e33080c..d7d54f2 100644
--- a/base/json/json_file_value_serializer.cc
+++ b/base/json/json_file_value_serializer.cc
@@ -4,7 +4,7 @@
#include "base/json/json_file_value_serializer.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc
index eceb538..67070ff 100644
--- a/base/json/json_reader_unittest.cc
+++ b/base/json/json_reader_unittest.cc
@@ -5,7 +5,7 @@
#include "base/json/json_reader.h"
#include "base/base_paths.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
diff --git a/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc
index f8d3a201..3be8bbf 100644
--- a/base/json/json_value_serializer_unittest.cc
+++ b/base/json/json_value_serializer_unittest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_reader.h"