diff options
Diffstat (limited to 'chrome')
61 files changed, 76 insertions, 76 deletions
diff --git a/chrome/common/automation_id.cc b/chrome/common/automation_id.cc index bd788ed..342cfa2 100644 --- a/chrome/common/automation_id.cc +++ b/chrome/common/automation_id.cc @@ -4,7 +4,7 @@ #include "chrome/common/automation_id.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/values.h" using base::DictionaryValue; diff --git a/chrome/common/badge_util.h b/chrome/common/badge_util.h index 91ed470..f9cc90d 100644 --- a/chrome/common/badge_util.h +++ b/chrome/common/badge_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/extensions/api/extension_action/action_info.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/common/child_process_logging.h b/chrome/common/child_process_logging.h index 2fff539..ce2e1b1 100644 --- a/chrome/common/child_process_logging.h +++ b/chrome/common/child_process_logging.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/debug/crash_logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "googleurl/src/gurl.h" class CommandLine; diff --git a/chrome/common/child_process_logging_mac.mm b/chrome/common/child_process_logging_mac.mm index 9a50024..3941380 100644 --- a/chrome/common/child_process_logging_mac.mm +++ b/chrome/common/child_process_logging_mac.mm @@ -7,10 +7,10 @@ #import <Foundation/Foundation.h> #include "base/command_line.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/metrics/variations/variations_util.h" diff --git a/chrome/common/child_process_logging_mac_unittest.mm b/chrome/common/child_process_logging_mac_unittest.mm index 2f62633..bdd93b9 100644 --- a/chrome/common/child_process_logging_mac_unittest.mm +++ b/chrome/common/child_process_logging_mac_unittest.mm @@ -11,7 +11,7 @@ #include "base/debug/crash_logging.h" #include "base/logging.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/common/child_process_logging_posix.cc b/chrome/common/child_process_logging_posix.cc index 1f284fe..50d214c 100644 --- a/chrome/common/child_process_logging_posix.cc +++ b/chrome/common/child_process_logging_posix.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/format_macros.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/metrics/variations/variations_util.h" #include "chrome/installer/util/google_update_settings.h" diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc index cb33be6..18fe62a 100644 --- a/chrome/common/child_process_logging_win.cc +++ b/chrome/common/child_process_logging_win.cc @@ -7,9 +7,9 @@ #include <windows.h> #include "base/command_line.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/metrics/variations/variations_util.h" diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 535250b..13a2069 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -9,10 +9,10 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/common/child_process_logging.h" diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index a88ca9f..1573014 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/sys_info.h" #include "base/version.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h index a128702..1bf01b6 100644 --- a/chrome/common/chrome_utility_messages.h +++ b/chrome/common/chrome_utility_messages.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" #include "base/platform_file.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/values.h" #include "chrome/common/extensions/update_manifest.h" #include "chrome/common/safe_browsing/zip_analyzer.h" diff --git a/chrome/common/chrome_version_info_android.cc b/chrome/common/chrome_version_info_android.cc index 82c4b92..52e12ea 100644 --- a/chrome/common/chrome_version_info_android.cc +++ b/chrome/common/chrome_version_info_android.cc @@ -6,7 +6,7 @@ #include "base/android/build_info.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" namespace chrome { diff --git a/chrome/common/chrome_version_info_win.cc b/chrome/common/chrome_version_info_win.cc index c16cfc6..caf5c67 100644 --- a/chrome/common/chrome_version_info_win.cc +++ b/chrome/common/chrome_version_info_win.cc @@ -8,7 +8,7 @@ #include "base/debug/profiler.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/install_util.h" diff --git a/chrome/common/cloud_print/cloud_print_helpers.cc b/chrome/common/cloud_print/cloud_print_helpers.cc index 3305c5b..992182f 100644 --- a/chrome/common/cloud_print/cloud_print_helpers.cc +++ b/chrome/common/cloud_print/cloud_print_helpers.cc @@ -9,7 +9,7 @@ #include "base/md5.h" #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "base/values.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/common/cloud_print/cloud_print_helpers_unittest.cc b/chrome/common/cloud_print/cloud_print_helpers_unittest.cc index abfd001..7bf7492 100644 --- a/chrome/common/cloud_print/cloud_print_helpers_unittest.cc +++ b/chrome/common/cloud_print/cloud_print_helpers_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/common/cloud_print/cloud_print_helpers.h" #include "base/md5.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "chrome/common/chrome_version_info.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/content_settings_helper.h b/chrome/common/content_settings_helper.h index a29e30d..3662afc 100644 --- a/chrome/common/content_settings_helper.h +++ b/chrome/common/content_settings_helper.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string16.h" +#include "base/strings/string16.h" class GURL; diff --git a/chrome/common/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc index ee02312..c6dc872 100644 --- a/chrome/common/content_settings_pattern.cc +++ b/chrome/common/content_settings_pattern.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "chrome/common/content_settings_pattern_parser.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" diff --git a/chrome/common/content_settings_pattern_parser.cc b/chrome/common/content_settings_pattern_parser.cc index 73da479..e92e3e0 100644 --- a/chrome/common/content_settings_pattern_parser.cc +++ b/chrome/common/content_settings_pattern_parser.cc @@ -4,7 +4,7 @@ #include "chrome/common/content_settings_pattern_parser.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/custom_handlers/protocol_handler.cc b/chrome/common/custom_handlers/protocol_handler.cc index 4990ebc..8b4d893 100644 --- a/chrome/common/custom_handlers/protocol_handler.cc +++ b/chrome/common/custom_handlers/protocol_handler.cc @@ -4,7 +4,7 @@ #include "chrome/common/custom_handlers/protocol_handler.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "net/base/escape.h" diff --git a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc index 21b79c6..11c14d4 100644 --- a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc +++ b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "base/command_line.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/commands/commands_handler.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/api/extension_action/action_info.h b/chrome/common/extensions/api/extension_action/action_info.h index a0f7e8b..e62e97e 100644 --- a/chrome/common/extensions/api/extension_action/action_info.h +++ b/chrome/common/extensions/api/extension_action/action_info.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc index 829ec47..be02b20 100644 --- a/chrome/common/extensions/api/extension_api.cc +++ b/chrome/common/extensions/api/extension_api.cc @@ -12,9 +12,9 @@ #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/values.h" #include "chrome/common/extensions/api/generated_schemas.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc index 0047d56..08604f7 100644 --- a/chrome/common/extensions/api/extension_api_unittest.cc +++ b/chrome/common/extensions/api/extension_api_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/api/i18n/default_locale_handler.cc b/chrome/common/extensions/api/i18n/default_locale_handler.cc index ea979e4..5ac7f16 100644 --- a/chrome/common/extensions/api/i18n/default_locale_handler.cc +++ b/chrome/common/extensions/api/i18n/default_locale_handler.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/memory/scoped_ptr.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 "base/values.h" #include "chrome/common/extensions/extension_l10n_util.h" diff --git a/chrome/common/extensions/api/input_ime/input_components_handler.cc b/chrome/common/extensions/api/input_ime/input_components_handler.cc index d0fa4eb..e9eac97 100644 --- a/chrome/common/extensions/api/input_ime/input_components_handler.cc +++ b/chrome/common/extensions/api/input_ime/input_components_handler.cc @@ -5,8 +5,8 @@ #include "chrome/common/extensions/api/input_ime/input_components_handler.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/api/omnibox/omnibox_handler.cc b/chrome/common/extensions/api/omnibox/omnibox_handler.cc index 1b90046..49a2bfc 100644 --- a/chrome/common/extensions/api/omnibox/omnibox_handler.cc +++ b/chrome/common/extensions/api/omnibox/omnibox_handler.cc @@ -5,7 +5,7 @@ #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/api/page_launcher/page_launcher_handler.h b/chrome/common/extensions/api/page_launcher/page_launcher_handler.h index bf18f51..9659d64 100644 --- a/chrome/common/extensions/api/page_launcher/page_launcher_handler.h +++ b/chrome/common/extensions/api/page_launcher/page_launcher_handler.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/extensions/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/system_indicator/system_indicator_handler.h b/chrome/common/extensions/api/system_indicator/system_indicator_handler.h index b136a57..7267f82 100644 --- a/chrome/common/extensions/api/system_indicator/system_indicator_handler.h +++ b/chrome/common/extensions/api/system_indicator/system_indicator_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_HANDLER_H_ #define CHROME_COMMON_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_HANDLER_H_ -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handler.h" diff --git a/chrome/common/extensions/command.cc b/chrome/common/extensions/command.cc index 4c7868a..fb8524d 100644 --- a/chrome/common/extensions/command.cc +++ b/chrome/common/extensions/command.cc @@ -5,9 +5,9 @@ #include "chrome/common/extensions/command.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/common/extensions/command.h b/chrome/common/extensions/command.h index bccfe2a..77ff28a 100644 --- a/chrome/common/extensions/command.h +++ b/chrome/common/extensions/command.h @@ -5,10 +5,10 @@ #ifndef CHROME_COMMON_EXTENSIONS_COMMAND_H_ #define CHROME_COMMON_EXTENSIONS_COMMAND_H_ -#include <string> #include <map> +#include <string> -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/base/accelerators/accelerator.h" namespace base { diff --git a/chrome/common/extensions/command_unittest.cc b/chrome/common/extensions/command_unittest.cc index 379251c..847add8 100644 --- a/chrome/common/extensions/command_unittest.cc +++ b/chrome/common/extensions/command_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/common/extensions/command.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/csp_handler.cc b/chrome/common/extensions/csp_handler.cc index ec695d5..fbf2e48 100644 --- a/chrome/common/extensions/csp_handler.cc +++ b/chrome/common/extensions/csp_handler.cc @@ -5,7 +5,7 @@ #include "chrome/common/extensions/csp_handler.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/csp_validator.h" diff --git a/chrome/common/extensions/csp_validator.cc b/chrome/common/extensions/csp_validator.cc index 8f7805c..f33e1ac 100644 --- a/chrome/common/extensions/csp_validator.cc +++ b/chrome/common/extensions/csp_validator.cc @@ -4,9 +4,9 @@ #include "chrome/common/extensions/csp_validator.h" -#include "base/string_util.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/string_util.h" namespace extensions { diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 5220397..1bdd380 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -12,11 +12,11 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/stl_util.h" -#include "base/string16.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc index f245782..551db5e 100644 --- a/chrome/common/extensions/extension_constants.cc +++ b/chrome/common/extensions/extension_constants.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/command_line.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/common/chrome_switches.h" #include "net/base/escape.h" #include "net/base/url_util.h" diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index 2f4b446..a0b4243 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -15,7 +15,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc index bc62e1c..b9d567d 100644 --- a/chrome/common/extensions/extension_file_util_unittest.cc +++ b/chrome/common/extensions/extension_file_util_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/json_string_value_serializer.h" #include "base/path_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index 7949353..3e1ab3e 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -14,10 +14,10 @@ #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/values.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension_file_util.h" +#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/message_bundle.h" #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" diff --git a/chrome/common/extensions/extension_localization_peer.cc b/chrome/common/extensions/extension_localization_peer.cc index 295b36a..9e7129c 100644 --- a/chrome/common/extensions/extension_localization_peer.cc +++ b/chrome/common/extensions/extension_localization_peer.cc @@ -5,7 +5,7 @@ #include "chrome/common/extensions/extension_localization_peer.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/message_bundle.h" #include "chrome/common/url_constants.h" diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 275a41e..d9896c9 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -5,8 +5,8 @@ #include "base/file_util.h" #include "base/format_macros.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/command.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/feature_switch.cc b/chrome/common/extensions/feature_switch.cc index 156cafc..e8d2664 100644 --- a/chrome/common/extensions/feature_switch.cc +++ b/chrome/common/extensions/feature_switch.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/metrics/field_trial.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/common/chrome_switches.h" namespace extensions { diff --git a/chrome/common/extensions/features/feature.cc b/chrome/common/extensions/features/feature.cc index 5a93bf8..054c675 100644 --- a/chrome/common/extensions/features/feature.cc +++ b/chrome/common/extensions/features/feature.cc @@ -8,8 +8,8 @@ #include "base/command_line.h" #include "base/lazy_instance.h" -#include "base/stringprintf.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "chrome/common/chrome_switches.h" using chrome::VersionInfo; diff --git a/chrome/common/extensions/features/simple_feature.cc b/chrome/common/extensions/features/simple_feature.cc index 2d20787..9fc0247 100644 --- a/chrome/common/extensions/features/simple_feature.cc +++ b/chrome/common/extensions/features/simple_feature.cc @@ -10,9 +10,9 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/sha1.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "chrome/common/chrome_switches.h" using chrome::VersionInfo; diff --git a/chrome/common/extensions/incognito_handler.h b/chrome/common/extensions/incognito_handler.h index f036e55..b9eadee 100644 --- a/chrome/common/extensions/incognito_handler.h +++ b/chrome/common/extensions/incognito_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_EXTENSIONS_INCOGNITO_HANDLER_H_ #define CHROME_COMMON_EXTENSIONS_INCOGNITO_HANDLER_H_ -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handler.h" diff --git a/chrome/common/extensions/manifest.cc b/chrome/common/extensions/manifest.cc index b9dedcf..52ce77b 100644 --- a/chrome/common/extensions/manifest.cc +++ b/chrome/common/extensions/manifest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/stringprintf.h" #include "base/strings/string_split.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/features/base_feature_provider.h" diff --git a/chrome/common/extensions/manifest.h b/chrome/common/extensions/manifest.h index 7c37628..0cade48 100644 --- a/chrome/common/extensions/manifest.h +++ b/chrome/common/extensions/manifest.h @@ -6,11 +6,11 @@ #define CHROME_COMMON_EXTENSIONS_MANIFEST_H_ #include <map> -#include <string> #include <set> +#include <string> #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/values.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handler.h b/chrome/common/extensions/manifest_handler.h index 030aa0a..bcd78d0 100644 --- a/chrome/common/extensions/manifest_handler.h +++ b/chrome/common/extensions/manifest_handler.h @@ -11,7 +11,7 @@ #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/extensions/manifest.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handler_helpers.h b/chrome/common/extensions/manifest_handler_helpers.h index 0abd0d6..29ad904 100644 --- a/chrome/common/extensions/manifest_handler_helpers.h +++ b/chrome/common/extensions/manifest_handler_helpers.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" class ExtensionIconSet; diff --git a/chrome/common/extensions/manifest_handlers/app_isolation_info.cc b/chrome/common/extensions/manifest_handlers/app_isolation_info.cc index 1c368cd..e619b84 100644 --- a/chrome/common/extensions/manifest_handlers/app_isolation_info.cc +++ b/chrome/common/extensions/manifest_handlers/app_isolation_info.cc @@ -5,7 +5,7 @@ #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc index 7a564d0..9fefea8 100644 --- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc +++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/manifest_handlers/kiosk_enabled_info.cc b/chrome/common/extensions/manifest_handlers/kiosk_enabled_info.cc index de113ba..3a77648 100644 --- a/chrome/common/extensions/manifest_handlers/kiosk_enabled_info.cc +++ b/chrome/common/extensions/manifest_handlers/kiosk_enabled_info.cc @@ -5,8 +5,8 @@ #include "chrome/common/extensions/manifest_handlers/kiosk_enabled_info.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc b/chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc index 6badf92..4594d47 100644 --- a/chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc +++ b/chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc @@ -6,7 +6,7 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/common/extensions/manifest_handlers/offline_enabled_info.cc b/chrome/common/extensions/manifest_handlers/offline_enabled_info.cc index 91575e2..3f32e52 100644 --- a/chrome/common/extensions/manifest_handlers/offline_enabled_info.cc +++ b/chrome/common/extensions/manifest_handlers/offline_enabled_info.cc @@ -5,8 +5,8 @@ #include "chrome/common/extensions/manifest_handlers/offline_enabled_info.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/common/extensions/manifest_handlers/sandboxed_page_info.cc b/chrome/common/extensions/manifest_handlers/sandboxed_page_info.cc index c303601..9d2d7b1 100644 --- a/chrome/common/extensions/manifest_handlers/sandboxed_page_info.cc +++ b/chrome/common/extensions/manifest_handlers/sandboxed_page_info.cc @@ -6,7 +6,7 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/csp_validator.h" diff --git a/chrome/common/extensions/manifest_handlers/shared_module_info.cc b/chrome/common/extensions/manifest_handlers/shared_module_info.cc index fb13fd9..d185243 100644 --- a/chrome/common/extensions/manifest_handlers/shared_module_info.cc +++ b/chrome/common/extensions/manifest_handlers/shared_module_info.cc @@ -6,8 +6,8 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc index 248ae5b..b0cdde8 100644 --- a/chrome/common/extensions/manifest_url_handler.cc +++ b/chrome/common/extensions/manifest_url_handler.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.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 "base/values.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/common/extensions/message_bundle.cc b/chrome/common/extensions/message_bundle.cc index 4f3e20e..9a6481d 100644 --- a/chrome/common/extensions/message_bundle.cc +++ b/chrome/common/extensions/message_bundle.cc @@ -13,7 +13,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_l10n_util.h" diff --git a/chrome/common/extensions/message_bundle_unittest.cc b/chrome/common/extensions/message_bundle_unittest.cc index 1171713..bd63124 100644 --- a/chrome/common/extensions/message_bundle_unittest.cc +++ b/chrome/common/extensions/message_bundle_unittest.cc @@ -10,7 +10,7 @@ #include "base/i18n/rtl.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_l10n_util.h" diff --git a/chrome/common/extensions/mime_types_handler.cc b/chrome/common/extensions/mime_types_handler.cc index 3bca245..ed8a37d 100644 --- a/chrome/common/extensions/mime_types_handler.cc +++ b/chrome/common/extensions/mime_types_handler.cc @@ -5,8 +5,8 @@ #include "chrome/common/extensions/mime_types_handler.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/common/extensions/permissions/bluetooth_device_permission.cc b/chrome/common/extensions/permissions/bluetooth_device_permission.cc index f3eba66..cea2f06 100644 --- a/chrome/common/extensions/permissions/bluetooth_device_permission.cc +++ b/chrome/common/extensions/permissions/bluetooth_device_permission.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/logging.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/permissions/bluetooth_device_permission_data.h" #include "chrome/common/extensions/permissions/permissions_info.h" diff --git a/chrome/common/extensions/permissions/media_galleries_permission.cc b/chrome/common/extensions/permissions/media_galleries_permission.cc index 75fb51b..4f4fd6b 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission.cc +++ b/chrome/common/extensions/permissions/media_galleries_permission.cc @@ -8,7 +8,7 @@ #include <string> #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/permissions/permissions_info.h" #include "grit/generated_resources.h" diff --git a/chrome/common/extensions/permissions/media_galleries_permission_data.cc b/chrome/common/extensions/permissions/media_galleries_permission_data.cc index 5a675ff..0b76bba 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission_data.cc +++ b/chrome/common/extensions/permissions/media_galleries_permission_data.cc @@ -4,7 +4,7 @@ #include "chrome/common/extensions/permissions/media_galleries_permission_data.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/values.h" #include "chrome/common/extensions/permissions/media_galleries_permission.h" |