diff options
Diffstat (limited to 'webkit/common')
-rw-r--r-- | webkit/common/blob/blob_data.cc | 2 | ||||
-rw-r--r-- | webkit/common/database/database_connections_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/common/dom_storage/dom_storage_map_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/common/fileapi/file_system_util.cc | 2 | ||||
-rw-r--r-- | webkit/common/webdropdata.cc | 2 | ||||
-rw-r--r-- | webkit/common/webpreferences.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/webkit/common/blob/blob_data.cc b/webkit/common/blob/blob_data.cc index 26b11d2..8d6acff 100644 --- a/webkit/common/blob/blob_data.cc +++ b/webkit/common/blob/blob_data.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" namespace webkit_blob { diff --git a/webkit/common/database/database_connections_unittest.cc b/webkit/common/database/database_connections_unittest.cc index 23d6847..013edd5 100644 --- a/webkit/common/database/database_connections_unittest.cc +++ b/webkit/common/database/database_connections_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/common/database/database_connections.h" diff --git a/webkit/common/dom_storage/dom_storage_map_unittest.cc b/webkit/common/dom_storage/dom_storage_map_unittest.cc index 29f5bb1..232b5e6 100644 --- a/webkit/common/dom_storage/dom_storage_map_unittest.cc +++ b/webkit/common/dom_storage/dom_storage_map_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/common/dom_storage/dom_storage_map.h" diff --git a/webkit/common/fileapi/file_system_util.cc b/webkit/common/fileapi/file_system_util.cc index 2583d54..a2e14c1 100644 --- a/webkit/common/fileapi/file_system_util.cc +++ b/webkit/common/fileapi/file_system_util.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "webkit/base/origin_url_conversions.h" diff --git a/webkit/common/webdropdata.cc b/webkit/common/webdropdata.cc index 97c0497..b32e8a3 100644 --- a/webkit/common/webdropdata.cc +++ b/webkit/common/webdropdata.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebDragData.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index 9bf7e3e..db977f5 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/string_util.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/WebSettings.h" #include "third_party/icu/public/common/unicode/uchar.h" |