diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 06:22:28 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 06:22:28 +0000 |
commit | b321a9d3142ebc2cadbfc3d58a7b39afe0b07286 (patch) | |
tree | f477a7a802825f03f18e28aa23b3c80c48de6f38 /cloud_print | |
parent | 233a5f6248467c6e0c1a6531e4d7a7187d33dc09 (diff) | |
download | chromium_src-b321a9d3142ebc2cadbfc3d58a7b39afe0b07286.zip chromium_src-b321a9d3142ebc2cadbfc3d58a7b39afe0b07286.tar.gz chromium_src-b321a9d3142ebc2cadbfc3d58a7b39afe0b07286.tar.bz2 |
Use a direct include of strings headers in cloud_print/.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16511009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
19 files changed, 20 insertions, 20 deletions
diff --git a/cloud_print/common/win/cloud_print_utils.h b/cloud_print/common/win/cloud_print_utils.h index bab86e6..7effa1b 100644 --- a/cloud_print/common/win/cloud_print_utils.h +++ b/cloud_print/common/win/cloud_print_utils.h @@ -7,7 +7,7 @@ #include <wtypes.h> -#include "base/string16.h" +#include "base/strings/string16.h" namespace cloud_print { diff --git a/cloud_print/common/win/install_utils.h b/cloud_print/common/win/install_utils.h index e4387d4..1e484cf 100644 --- a/cloud_print/common/win/install_utils.h +++ b/cloud_print/common/win/install_utils.h @@ -9,7 +9,7 @@ #include <string> #include "base/files/file_path.h" -#include "base/string16.h" +#include "base/strings/string16.h" namespace cloud_print { diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index d51f503c..6b9ccfc 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "net/base/escape.h" #include "net/base/io_buffer.h" diff --git a/cloud_print/service/service_state_unittest.cc b/cloud_print/service/service_state_unittest.cc index 4e5d2d0..50155e8 100644 --- a/cloud_print/service/service_state_unittest.cc +++ b/cloud_print/service/service_state_unittest.cc @@ -4,7 +4,7 @@ #include "cloud_print/service/service_state.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc index f91e5e8..5a3c502 100644 --- a/cloud_print/service/win/cloud_print_service.cc +++ b/cloud_print/service/win/cloud_print_service.cc @@ -15,7 +15,7 @@ #include "base/guid.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "chrome/common/chrome_constants.h" diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index 422caeb..cf8e777 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/threading/thread.h" #include "chrome/common/chrome_constants.h" #include "cloud_print/common/win/cloud_print_utils.h" diff --git a/cloud_print/service/win/local_security_policy.cc b/cloud_print/service/win/local_security_policy.cc index c1190dd..44c4e95 100644 --- a/cloud_print/service/win/local_security_policy.cc +++ b/cloud_print/service/win/local_security_policy.cc @@ -9,7 +9,7 @@ #include <windows.h> #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" const wchar_t kSeServiceLogonRight[] = L"SeServiceLogonRight"; diff --git a/cloud_print/service/win/local_security_policy.h b/cloud_print/service/win/local_security_policy.h index 712ab19..3e800a7 100644 --- a/cloud_print/service/win/local_security_policy.h +++ b/cloud_print/service/win/local_security_policy.h @@ -9,7 +9,7 @@ #include <ntsecapi.h> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" extern const wchar_t kSeServiceLogonRight[]; diff --git a/cloud_print/service/win/service_controller.h b/cloud_print/service/win/service_controller.h index 449864c..167b0c1 100644 --- a/cloud_print/service/win/service_controller.h +++ b/cloud_print/service/win/service_controller.h @@ -9,7 +9,7 @@ #include <string> #include "base/command_line.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "cloud_print/resources.h" namespace base { diff --git a/cloud_print/service/win/service_utils.cc b/cloud_print/service/win/service_utils.cc index 5635e6f..e63f2ab 100644 --- a/cloud_print/service/win/service_utils.cc +++ b/cloud_print/service/win/service_utils.cc @@ -9,7 +9,7 @@ #include <security.h> // NOLINT #include "base/command_line.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/common/chrome_switches.h" string16 GetLocalComputerName() { diff --git a/cloud_print/service/win/service_utils.h b/cloud_print/service/win/service_utils.h index b75479e..083e091 100644 --- a/cloud_print/service/win/service_utils.h +++ b/cloud_print/service/win/service_utils.h @@ -7,7 +7,7 @@ class CommandLine; -#include "base/string16.h" +#include "base/strings/string16.h" string16 ReplaceLocalHostInName(const string16& user_name); string16 GetCurrentUserName(); diff --git a/cloud_print/service/win/setup_listener.h b/cloud_print/service/win/setup_listener.h index 52c059d..9745c62 100644 --- a/cloud_print/service/win/setup_listener.h +++ b/cloud_print/service/win/setup_listener.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ipc/ipc_listener.h" namespace base { diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 4cde7a9..26fc32f 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -17,8 +17,8 @@ #include "base/path_service.h" #include "base/process.h" #include "base/process_util.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index 9008285..084816e 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -20,7 +20,7 @@ #include "base/path_service.h" #include "base/process.h" #include "base/process_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.h b/cloud_print/virtual_driver/win/port_monitor/port_monitor.h index 3e21f88..45476ec 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.h +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.h @@ -9,7 +9,7 @@ #include <string> #include "base/file_util.h" #include "base/process.h" -#include "base/string16.h" +#include "base/strings/string16.h" namespace cloud_print { diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc index ae25d55..6bc5962 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc @@ -19,7 +19,7 @@ #include "base/path_service.h" #include "base/process.h" #include "base/process_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc index cc935bf..1ab8a36 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc @@ -6,7 +6,7 @@ #include <winspool.h> #include "base/file_util.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" #include "cloud_print/virtual_driver/win/port_monitor/spooler_win.h" diff --git a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc index 71aa2bf..e214529 100644 --- a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc +++ b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/win/windows_version.h" #include "cloud_print/common/win/cloud_print_utils.h" diff --git a/cloud_print/virtual_driver/win/virtual_driver_helpers.h b/cloud_print/virtual_driver/win/virtual_driver_helpers.h index 18736cc..7a275ac 100644 --- a/cloud_print/virtual_driver/win/virtual_driver_helpers.h +++ b/cloud_print/virtual_driver/win/virtual_driver_helpers.h @@ -7,7 +7,7 @@ #include <windows.h> -#include "base/string16.h" +#include "base/strings/string16.h" namespace base { class FilePath; |