summaryrefslogtreecommitdiffstats
path: root/webkit/browser/database
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/browser/database
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/browser/database')
-rw-r--r--webkit/browser/database/database_quota_client_unittest.cc2
-rw-r--r--webkit/browser/database/database_tracker.cc2
-rw-r--r--webkit/browser/database/database_tracker_unittest.cc2
-rw-r--r--webkit/browser/database/database_util.cc2
-rw-r--r--webkit/browser/database/database_util_unittest.cc2
-rw-r--r--webkit/browser/database/databases_table.cc2
-rw-r--r--webkit/browser/database/databases_table_unittest.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/webkit/browser/database/database_quota_client_unittest.cc b/webkit/browser/database/database_quota_client_unittest.cc
index abb7f21..ddb7aef 100644
--- a/webkit/browser/database/database_quota_client_unittest.cc
+++ b/webkit/browser/database/database_quota_client_unittest.cc
@@ -8,7 +8,7 @@
#include "base/files/file_path.h"
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc
index 2567539..d82c46a 100644
--- a/webkit/browser/database/database_tracker.cc
+++ b/webkit/browser/database/database_tracker.cc
@@ -13,7 +13,7 @@
#include "base/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "sql/connection.h"
#include "sql/meta_table.h"
diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc
index 056aa88..c9abd12 100644
--- a/webkit/browser/database/database_tracker_unittest.cc
+++ b/webkit/browser/database/database_tracker_unittest.cc
@@ -9,8 +9,8 @@
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
#include "base/platform_file.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webkit/browser/database/database_util.cc b/webkit/browser/database/database_util.cc
index b2b1cde..b5929cc 100644
--- a/webkit/browser/database/database_util.cc
+++ b/webkit/browser/database/database_util.cc
@@ -5,7 +5,7 @@
#include "webkit/browser/database/database_util.h"
#include "base/basictypes.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
#include "webkit/browser/database/database_tracker.h"
diff --git a/webkit/browser/database/database_util_unittest.cc b/webkit/browser/database/database_util_unittest.cc
index 649b58a..c0b85f8 100644
--- a/webkit/browser/database/database_util_unittest.cc
+++ b/webkit/browser/database/database_util_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/strings/string_piece.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/base/origin_url_conversions.h"
#include "webkit/browser/database/database_util.h"
diff --git a/webkit/browser/database/databases_table.cc b/webkit/browser/database/databases_table.cc
index 45c76ec..1d06676 100644
--- a/webkit/browser/database/databases_table.cc
+++ b/webkit/browser/database/databases_table.cc
@@ -5,7 +5,7 @@
#include "webkit/browser/database/databases_table.h"
#include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "sql/statement.h"
namespace webkit_database {
diff --git a/webkit/browser/database/databases_table_unittest.cc b/webkit/browser/database/databases_table_unittest.cc
index a5fd0b4..e967205 100644
--- a/webkit/browser/database/databases_table_unittest.cc
+++ b/webkit/browser/database/databases_table_unittest.cc
@@ -4,7 +4,7 @@
#include "base/bind.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "sql/connection.h"
#include "sql/statement.h"
#include "testing/gtest/include/gtest/gtest.h"