summaryrefslogtreecommitdiffstats
path: root/android_webview
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 /android_webview
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 'android_webview')
-rw-r--r--android_webview/browser/aw_form_database_service_unittest.cc2
-rw-r--r--android_webview/native/state_serializer_unittests.cc2
-rw-r--r--android_webview/renderer/aw_content_renderer_client.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/browser/aw_form_database_service_unittest.cc b/android_webview/browser/aw_form_database_service_unittest.cc
index 6f8e410..bae9be3 100644
--- a/android_webview/browser/aw_form_database_service_unittest.cc
+++ b/android_webview/browser/aw_form_database_service_unittest.cc
@@ -9,7 +9,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/webdata/autofill_webdata_service.h"
#include "components/autofill/common/form_field_data.h"
#include "content/public/test/test_browser_thread.h"
diff --git a/android_webview/native/state_serializer_unittests.cc b/android_webview/native/state_serializer_unittests.cc
index 539ee54..7f4690e 100644
--- a/android_webview/native/state_serializer_unittests.cc
+++ b/android_webview/native/state_serializer_unittests.cc
@@ -8,8 +8,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/pickle.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/common/content_client.h"
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index 8548334..fc532f8 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -9,7 +9,7 @@
#include "android_webview/renderer/aw_render_view_ext.h"
#include "android_webview/renderer/view_renderer.h"
#include "base/message_loop.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/visitedlink/renderer/visitedlink_slave.h"
#include "content/public/renderer/render_thread.h"
#include "googleurl/src/gurl.h"