Use a direct include of strings headers in ppapi/, printing/.

BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16366009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205664 0039d316-1c4b-4281-b951-d872f2087c98
GuoXi · Jun 11, 2013 · 896d161 · 896d161
1 parent 516f018
commit 896d161
Show file tree

Hide file tree

Showing 24 changed files with 28 additions and 28 deletions.
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_options.cc b/ppapi/native_client/src/trusted/plugin/pnacl_options.cc
@@ -45,7 +45,7 @@ std::vector<char> PnaclOptions::GetOptCommandline() {
   std::vector<nacl::string> tokens;
 
   // Split the experimental_flags_ + the -On along whitespace.
-  // Mostly a copy of "base/string_util.h", but avoid importing
+  // Mostly a copy of "base/strings/string_util.h", but avoid importing
   // base into the PPAPI plugin for now.
   nacl::string delim(" ");
   nacl::string str = experimental_flags_;

diff --git a/ppapi/proxy/browser_font_resource_trusted.cc b/ppapi/proxy/browser_font_resource_trusted.cc
@@ -4,7 +4,7 @@
 
 #include "ppapi/proxy/browser_font_resource_trusted.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"

diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
@@ -10,7 +10,7 @@
 #include "base/files/file_path.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/sync_socket.h"
 #include "base/values.h"
 #include "gpu/command_buffer/common/command_buffer.h"

diff --git a/ppapi/proxy/ppb_var_unittest.cc b/ppapi/proxy/ppb_var_unittest.cc
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_var.h"

diff --git a/ppapi/proxy/ppp_messaging_proxy_perftest.cc b/ppapi/proxy/ppp_messaging_proxy_perftest.cc
@@ -4,7 +4,7 @@
 
 #include "base/command_line.h"
 #include "base/perftimer.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "ppapi/c/ppp_messaging.h"
 #include "ppapi/proxy/ppapi_proxy_test.h"
 #include "ppapi/proxy/serialized_var.h"

diff --git a/ppapi/shared_impl/dictionary_var.cc b/ppapi/shared_impl/dictionary_var.cc
@@ -5,7 +5,7 @@
 #include "ppapi/shared_impl/dictionary_var.h"
 
 #include "base/memory/ref_counted.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "ppapi/shared_impl/array_var.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var_tracker.h"

diff --git a/ppapi/shared_impl/ppb_gamepad_shared.h b/ppapi/shared_impl/ppb_gamepad_shared.h
@@ -6,7 +6,7 @@
 #define PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
 
 #include "base/atomicops.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 

diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc
@@ -20,7 +20,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/private/ppb_net_address_private.h"

diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc
@@ -7,8 +7,8 @@
 #include <limits>
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var_tracker.h"

diff --git a/ppapi/tests/test_case.cc b/ppapi/tests/test_case.cc
@@ -52,8 +52,8 @@ std::string StripTestCase(const std::string& full_test_name) {
 // the bool indicating whether the test should be run.
 void ParseTestFilter(const std::string& test_filter,
                      std::map<std::string, bool>* remaining_tests) {
-  // We can't use base/string_util.h::Tokenize in ppapi, so we have to do it
-  // ourselves.
+  // We can't use base/strings/string_util.h::Tokenize in ppapi, so we have to
+  // do it ourselves.
   std::istringstream filter_stream(test_filter);
   std::string current_test;
   while (std::getline(filter_stream, current_test, ',')) {

diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/ppapi_globals.h"

diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
@@ -8,8 +8,8 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"

diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "printing/print_job_constants.h"
 #include "printing/printing_export.h"
 

diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
@@ -19,7 +19,7 @@
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"

diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/scoped_handle.h"
 #include "printing/printing_export.h"
 

diff --git a/printing/image.cc b/printing/image.cc
@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/safe_numerics.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "third_party/skia/include/core/SkColor.h"

diff --git a/printing/print_dialog_gtk_interface.h b/printing/print_dialog_gtk_interface.h
@@ -5,7 +5,7 @@
 #ifndef PRINTING_PRINT_DIALOG_GTK_INTERFACE_H_
 #define PRINTING_PRINT_DIALOG_GTK_INTERFACE_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "printing/printing_context_gtk.h"
 #include "ui/gfx/native_widget_types.h"
 

diff --git a/printing/print_settings.h b/printing/print_settings.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "printing/page_range.h"
 #include "printing/page_setup.h"
 #include "printing/print_job_constants.h"

diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/i18n/time_formatting.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "base/values.h"

diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "printing/print_settings.h"
 #include "printing/units.h"

diff --git a/printing/printed_document.cc b/printing/printed_document.cc
@@ -15,8 +15,8 @@
 #include "base/i18n/time_formatting.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "printing/page_number.h"
 #include "printing/printed_page.h"

diff --git a/printing/printed_document.h b/printing/printed_document.h
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "printing/print_settings.h"
 #include "ui/gfx/native_widget_types.h"

diff --git a/printing/printed_pages_source.h b/printing/printed_pages_source.h
@@ -5,7 +5,7 @@
 #ifndef PRINTING_PRINTED_PAGES_SOURCE_H_
 #define PRINTING_PRINTED_PAGES_SOURCE_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace printing {
 

diff --git a/printing/printing_context.h b/printing/printing_context.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "printing/print_settings.h"
 #include "ui/gfx/native_widget_types.h"