diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:40:45 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:40:45 +0000 |
commit | 906265870c8a3cc44ebbcad14eaea84559a49aed (patch) | |
tree | fc025f2e228464be651f0ea502fb7415467e8278 /webkit/plugins/npapi | |
parent | 3aef722b8c533efc87df683a454f0779f9b6cabb (diff) | |
download | chromium_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/plugins/npapi')
-rw-r--r-- | webkit/plugins/npapi/plugin_host.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_instance.cc | 4 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_lib_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_list.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_list_mac.mm | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_list_posix.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_list_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_stream.cc | 4 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_utils_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/test/plugin_geturl_test.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_mac.mm | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin_ime_win.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin_impl.cc | 2 |
13 files changed, 15 insertions, 15 deletions
diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index ccbb9af..91889e5 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -11,7 +11,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" #include "build/build_config.h" #include "net/base/net_util.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/plugins/npapi/plugin_instance.cc index e24ff35..beabcd6 100644 --- a/webkit/plugins/npapi/plugin_instance.cc +++ b/webkit/plugins/npapi/plugin_instance.cc @@ -5,11 +5,11 @@ #include "webkit/plugins/npapi/plugin_instance.h" #include "base/bind.h" -#include "build/build_config.h" #include "base/file_util.h" #include "base/message_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "net/base/escape.h" #include "webkit/plugins/npapi/plugin_host.h" #include "webkit/plugins/npapi/plugin_lib.h" diff --git a/webkit/plugins/npapi/plugin_lib_unittest.cc b/webkit/plugins/npapi/plugin_lib_unittest.cc index 2cff95f..4f2ddf6 100644 --- a/webkit/plugins/npapi/plugin_lib_unittest.cc +++ b/webkit/plugins/npapi/plugin_lib_unittest.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/npapi/plugin_lib.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc index 1d3cf05..51863f8 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/strings/string_split.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 "net/base/mime_util.h" #include "webkit/plugins/npapi/plugin_utils.h" diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm index 5f5ffee..dff25d7 100644 --- a/webkit/plugins/npapi/plugin_list_mac.mm +++ b/webkit/plugins/npapi/plugin_list_mac.mm @@ -16,7 +16,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" using base::mac::ScopedCFTypeRef; diff --git a/webkit/plugins/npapi/plugin_list_posix.cc b/webkit/plugins/npapi/plugin_list_posix.cc index 6d3de14..ce7aabf 100644 --- a/webkit/plugins/npapi/plugin_list_posix.cc +++ b/webkit/plugins/npapi/plugin_list_posix.cc @@ -26,7 +26,7 @@ #include "base/stringprintf.h" #include "base/strings/string_split.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" // These headers must be included in this order to make the declaration gods diff --git a/webkit/plugins/npapi/plugin_list_unittest.cc b/webkit/plugins/npapi/plugin_list_unittest.cc index a562b07..c083d7a 100644 --- a/webkit/plugins/npapi/plugin_list_unittest.cc +++ b/webkit/plugins/npapi/plugin_list_unittest.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/npapi/plugin_list.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/npapi/mock_plugin_list.h" diff --git a/webkit/plugins/npapi/plugin_stream.cc b/webkit/plugins/npapi/plugin_stream.cc index 44fc224..5fcbace 100644 --- a/webkit/plugins/npapi/plugin_stream.cc +++ b/webkit/plugins/npapi/plugin_stream.cc @@ -13,10 +13,10 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" +#include "googleurl/src/gurl.h" #include "net/base/mime_util.h" #include "webkit/plugins/npapi/plugin_instance.h" -#include "googleurl/src/gurl.h" namespace webkit { namespace npapi { diff --git a/webkit/plugins/npapi/plugin_utils_unittest.cc b/webkit/plugins/npapi/plugin_utils_unittest.cc index d03606c..780c112 100644 --- a/webkit/plugins/npapi/plugin_utils_unittest.cc +++ b/webkit/plugins/npapi/plugin_utils_unittest.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.cc b/webkit/plugins/npapi/test/plugin_geturl_test.cc index 9d66a5d2..a3c28e6 100644 --- a/webkit/plugins/npapi/test/plugin_geturl_test.cc +++ b/webkit/plugins/npapi/test/plugin_geturl_test.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" // url for "self". The %22%22 is to make a statement for javascript to // evaluate and return. diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm index 161bb6f..9f32f94 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm +++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm @@ -16,7 +16,7 @@ #include "base/metrics/stats_counters.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 "skia/ext/skia_utils_mac.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/webkit/plugins/npapi/webplugin_ime_win.cc b/webkit/plugins/npapi/webplugin_ime_win.cc index 46bfaa9..e779b2d 100644 --- a/webkit/plugins/npapi/webplugin_ime_win.cc +++ b/webkit/plugins/npapi/webplugin_ime_win.cc @@ -10,8 +10,8 @@ #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "webkit/plugins/npapi/plugin_constants_win.h" #include "webkit/plugins/npapi/plugin_instance.h" diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index 71ce0a2..bea3e55 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "cc/layers/io_surface_layer.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_util.h" |