summaryrefslogtreecommitdiffstats
path: root/base/files
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 18:37:07 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 18:37:07 +0000
commita4ea1f1bb8965f37be0d9fcb39796096fd178a30 (patch)
treeec470c0361e3e410c6414835ef26012494053b07 /base/files
parent0aa509bb2ca4811b2f10b197c4f17c0f19b50980 (diff)
downloadchromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.zip
chromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.tar.gz
chromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.tar.bz2
Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/15735027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/files')
-rw-r--r--base/files/file_path.cc2
-rw-r--r--base/files/file_path_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/base/files/file_path.cc b/base/files/file_path.cc
index a9e4be2..74469b2 100644
--- a/base/files/file_path.cc
+++ b/base/files/file_path.cc
@@ -16,7 +16,7 @@
#include "base/string_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#if defined(OS_MACOSX)
#include "base/mac/scoped_cftyperef.h"
diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc
index 50befdf..8b2fcf5 100644
--- a/base/files/file_path_unittest.cc
+++ b/base/files/file_path_unittest.cc
@@ -4,7 +4,7 @@
#include "base/basictypes.h"
#include "base/files/file_path.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"