summaryrefslogtreecommitdiffstats
path: root/webkit/renderer
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:40:45 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:40:45 +0000
commit906265870c8a3cc44ebbcad14eaea84559a49aed (patch)
treefc025f2e228464be651f0ea502fb7415467e8278 /webkit/renderer
parent3aef722b8c533efc87df683a454f0779f9b6cabb (diff)
downloadchromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.zip
chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.gz
chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.bz2
Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, printing/, remoting/, rlz/, skia/, sql/, sync/, third_party/, tools/, webkit/, win8/.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15995038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/renderer')
-rw-r--r--webkit/renderer/cpp_bound_class.cc2
-rw-r--r--webkit/renderer/cpp_variant.cc2
-rw-r--r--webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc2
-rw-r--r--webkit/renderer/fileapi/webfilewriter_base_unittest.cc2
-rw-r--r--webkit/renderer/webpreferences_renderer.cc2
5 files changed, 5 insertions, 5 deletions
diff --git a/webkit/renderer/cpp_bound_class.cc b/webkit/renderer/cpp_bound_class.cc
index 6e7e923..0fdcedf 100644
--- a/webkit/renderer/cpp_bound_class.cc
+++ b/webkit/renderer/cpp_bound_class.cc
@@ -17,7 +17,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/stl_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/public/platform/WebString.h"
diff --git a/webkit/renderer/cpp_variant.cc b/webkit/renderer/cpp_variant.cc
index bea0573..4c913ff 100644
--- a/webkit/renderer/cpp_variant.cc
+++ b/webkit/renderer/cpp_variant.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
#include "webkit/renderer/cpp_variant.h"
diff --git a/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc b/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc
index aab4bf7..418e805 100644
--- a/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc
+++ b/webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc
@@ -5,7 +5,7 @@
#include <list>
#include "base/bind.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/renderer/dom_storage/dom_storage_cached_area.h"
#include "webkit/renderer/dom_storage/dom_storage_proxy.h"
diff --git a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc
index cdacfa4..7e2f4b2 100644
--- a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc
+++ b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc
@@ -7,7 +7,7 @@
#include "base/logging.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 "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebURL.h"
diff --git a/webkit/renderer/webpreferences_renderer.cc b/webkit/renderer/webpreferences_renderer.cc
index 2a311ac..9e0e517 100644
--- a/webkit/renderer/webpreferences_renderer.cc
+++ b/webkit/renderer/webpreferences_renderer.cc
@@ -4,7 +4,7 @@
#include "webkit/renderer/webpreferences_renderer.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"