diff options
Diffstat (limited to 'chrome')
153 files changed, 157 insertions, 156 deletions
diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc index 897d543..0a218a1 100644 --- a/chrome/browser/autofill/autofill_country.cc +++ b/chrome/browser/autofill/autofill_country.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc index 4b66009..bc5fd17 100644 --- a/chrome/browser/autofill/autofill_download.cc +++ b/chrome/browser/autofill/autofill_download.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "chrome/browser/autofill/autofill_metrics.h" #include "chrome/browser/autofill/autofill_xml_parser.h" diff --git a/chrome/browser/autofill/autofill_profile_unittest.cc b/chrome/browser/autofill/autofill_profile_unittest.cc index 8bfb3ba..28bf838 100644 --- a/chrome/browser/autofill/autofill_profile_unittest.cc +++ b/chrome/browser/autofill/autofill_profile_unittest.cc @@ -5,7 +5,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_common_test.h" diff --git a/chrome/browser/autofill/autofill_regexes.cc b/chrome/browser/autofill/autofill_regexes.cc index 5329958..b1ed629 100644 --- a/chrome/browser/autofill/autofill_regexes.cc +++ b/chrome/browser/autofill/autofill_regexes.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "unicode/regex.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 26486c3..745928b 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -15,7 +15,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc index d036b8d..ddc3b65 100644 --- a/chrome/browser/automation/automation_resource_message_filter.cc +++ b/chrome/browser/automation/automation_resource_message_filter.cc @@ -6,7 +6,7 @@ #include "base/path_service.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/automation/url_request_automation_job.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/net/url_request_mock_util.h" diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index ac6d012..cbb74f2 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <set> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background/background_mode_manager.h" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 1a6856e..d975e60 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -14,7 +14,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/browsing_data_appcache_helper_unittest.cc b/chrome/browser/browsing_data_appcache_helper_unittest.cc index d80f5c6..1b9e2f8 100644 --- a/chrome/browser/browsing_data_appcache_helper_unittest.cc +++ b/chrome/browser/browsing_data_appcache_helper_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/browsing_data_appcache_helper.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/test/testing_browser_process_test.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 78cd61f..84886b1 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -6,12 +6,13 @@ #include <algorithm> #include <map> +#include <set> #include "base/i18n/icu_encoding_detection.h" #include "base/i18n/icu_string_conversions.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" #include "base/string_util.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index d4fb184..d78b176 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -6,7 +6,7 @@ #include "base/json/json_writer.h" #include "base/memory/singleton.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc b/chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc index ac7394d..1e427ad 100644 --- a/chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc +++ b/chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace { const char kDefaultURLPath[] = "index.html"; diff --git a/chrome/browser/chromeos/login/views_login_display.cc b/chrome/browser/chromeos/login/views_login_display.cc index 6f5654b..26e6683 100644 --- a/chrome/browser/chromeos/login/views_login_display.cc +++ b/chrome/browser/chromeos/login/views_login_display.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <vector> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/message_bubble.h" diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index 61937ee..1731a67 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_accessibility_api.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc index c872d87..93448af 100644 --- a/chrome/browser/chromeos/network_message_observer.cc +++ b/chrome/browser/chromeos/network_message_observer.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/network_message_observer.h" #include "base/callback.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/notifications/balloon_view_host.cc b/chrome/browser/chromeos/notifications/balloon_view_host.cc index 1a2a946..707225e 100644 --- a/chrome/browser/chromeos/notifications/balloon_view_host.cc +++ b/chrome/browser/chromeos/notifications/balloon_view_host.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/notifications/balloon_view_host.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "chrome/common/extensions/extension_messages.h" #include "content/common/view_messages.h" diff --git a/chrome/browser/chromeos/panels/panel_scroller.cc b/chrome/browser/chromeos/panels/panel_scroller.cc index 1069d67..e40154b 100644 --- a/chrome/browser/chromeos/panels/panel_scroller.cc +++ b/chrome/browser/chromeos/panels/panel_scroller.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/panels/panel_scroller_container.h" diff --git a/chrome/browser/command_updater.cc b/chrome/browser/command_updater.cc index b55b09b..4a1b0db 100644 --- a/chrome/browser/command_updater.cc +++ b/chrome/browser/command_updater.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/observer_list.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" CommandUpdater::CommandUpdaterDelegate::~CommandUpdaterDelegate() { } diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index 8b7f42b..053fa85 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc index b3ff24d..8182514 100644 --- a/chrome/browser/diagnostics/diagnostics_model.cc +++ b/chrome/browser/diagnostics/diagnostics_model.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/path_service.h" #include "chrome/browser/diagnostics/diagnostics_test.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 7bebb65..2f5ca58 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/test/test_file_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/download/download_file_manager.cc b/chrome/browser/download/download_file_manager.cc index 1b6b267..ac0c55e 100644 --- a/chrome/browser/download/download_file_manager.cc +++ b/chrome/browser/download/download_file_manager.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 3e0cf36..a9fd017 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "base/task.h" diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index 1b80445..fe82fe8 100644 --- a/chrome/browser/download/download_manager_unittest.cc +++ b/chrome/browser/download/download_manager_unittest.cc @@ -9,7 +9,7 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc index 2f29b4a..ea9c73f 100644 --- a/chrome/browser/download/download_request_limiter.cc +++ b/chrome/browser/download/download_request_limiter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/download/download_request_limiter.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/download/download_request_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index a1b672c..4d87f124 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -12,7 +12,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/task.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/extensions/extension_accessibility_api.cc b/chrome/browser/extensions/extension_accessibility_api.cc index 6b00cc8..f632342 100644 --- a/chrome/browser/extensions/extension_accessibility_api.cc +++ b/chrome/browser/extensions/extension_accessibility_api.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "base/json/json_writer.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/extensions/extension_accessibility_api.h" diff --git a/chrome/browser/extensions/extension_app_api.cc b/chrome/browser/extensions/extension_app_api.cc index 6a95255..91899e9 100644 --- a/chrome/browser/extensions/extension_app_api.cc +++ b/chrome/browser/extensions/extension_app_api.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_app_api.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc index bc65a27..1992eb8 100644 --- a/chrome/browser/extensions/extension_bookmarks_module.cc +++ b/chrome/browser/extensions/extension_bookmarks_module.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/sha1.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/extension_content_settings_store.cc b/chrome/browser/extensions/extension_content_settings_store.cc index 395c3bb..779baf9 100644 --- a/chrome/browser/extensions/extension_content_settings_store.cc +++ b/chrome/browser/extensions/extension_content_settings_store.cc @@ -7,7 +7,7 @@ #include <set> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/extensions/extension_content_settings_api_constants.h" #include "chrome/browser/extensions/extension_content_settings_helpers.h" diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index 04966ac..8874209 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/extension_icon_manager.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" diff --git a/chrome/browser/extensions/extension_idle_api.cc b/chrome/browser/extensions/extension_idle_api.cc index 35600fa..bf22ecc 100644 --- a/chrome/browser/extensions/extension_idle_api.cc +++ b/chrome/browser/extensions/extension_idle_api.cc @@ -11,7 +11,7 @@ #include "base/json/json_writer.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/time.h" #include "chrome/browser/extensions/extension_event_router.h" diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc index 502a38a..7dafb3c 100644 --- a/chrome/browser/extensions/extension_management_browsertest.cc +++ b/chrome/browser/extensions/extension_management_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/ref_counted.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/extensions/autoupdate_interceptor.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc index 71f24b7..a510392 100644 --- a/chrome/browser/extensions/extension_menu_manager.cc +++ b/chrome/browser/extensions/extension_menu_manager.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index 73e37b8..756ec4e 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/chrome/browser/extensions/extension_message_service.cc @@ -6,7 +6,7 @@ #include "base/atomic_sequence_num.h" #include "base/json/json_writer.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_tabs_module.h" diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc index a11fac3..9d2ef06 100644 --- a/chrome/browser/extensions/extension_pref_value_map.cc +++ b/chrome/browser/extensions/extension_pref_value_map.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_pref_value_map.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/prefs/pref_value_map.h" diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc index da463ddb..b0ada5f 100644 --- a/chrome/browser/extensions/extension_preference_api.cc +++ b/chrome/browser/extensions/extension_preference_api.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/memory/singleton.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/extension_event_router.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index b58ecff..5098e77 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -5,7 +5,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "chrome/browser/extensions/extension_prefs.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 755c7d6..61649ce 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index a6b896d..786f69e 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index 797b371..ae62dca 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -13,7 +13,7 @@ #include "base/memory/scoped_handle.h" #include "base/metrics/histogram.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index d87df5a..6e6319d 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/extensions_quota_service.cc b/chrome/browser/extensions/extensions_quota_service.cc index 7a404642..0c41656 100644 --- a/chrome/browser/extensions/extensions_quota_service.cc +++ b/chrome/browser/extensions/extensions_quota_service.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/extensions_quota_service.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/extensions/extension_function.h" // If the browser stays open long enough, we reset state once a day. diff --git a/chrome/browser/extensions/extensions_quota_service_unittest.cc b/chrome/browser/extensions/extensions_quota_service_unittest.cc index feb7da2..07c724f 100644 --- a/chrome/browser/extensions/extensions_quota_service_unittest.cc +++ b/chrome/browser/extensions/extensions_quota_service_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/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/extensions/extensions_quota_service.h" diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc index b4b251c..d4446a9 100644 --- a/chrome/browser/extensions/pending_extension_manager.cc +++ b/chrome/browser/extensions/pending_extension_manager.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 958e0ab..758700c 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/pickle.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "base/version.h" diff --git a/chrome/browser/history/history_types.cc b/chrome/browser/history/history_types.cc index 01f0200..0dfa96d7 100644 --- a/chrome/browser/history/history_types.cc +++ b/chrome/browser/history/history_types.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace history { diff --git a/chrome/browser/history/query_parser.cc b/chrome/browser/history/query_parser.cc index d507bd1..782c708 100644 --- a/chrome/browser/history/query_parser.cc +++ b/chrome/browser/history/query_parser.cc @@ -10,7 +10,7 @@ #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace { diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc index 36ae56a..edfa221 100644 --- a/chrome/browser/history/starred_url_database.cc +++ b/chrome/browser/history/starred_url_database.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/history/visit_tracker.cc b/chrome/browser/history/visit_tracker.cc index 7bb0011..1dc2f18 100644 --- a/chrome/browser/history/visit_tracker.cc +++ b/chrome/browser/history/visit_tracker.cc @@ -4,7 +4,7 @@ #include "chrome/browser/history/visit_tracker.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace history { diff --git a/chrome/browser/history/visitsegment_database.cc b/chrome/browser/history/visitsegment_database.cc index f0b04a9..ac2afe8 100644 --- a/chrome/browser/history/visitsegment_database.cc +++ b/chrome/browser/history/visitsegment_database.cc @@ -11,7 +11,7 @@ #include <vector> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/page_usage_data.h" diff --git a/chrome/browser/icon_manager.cc b/chrome/browser/icon_manager.cc index 500ed6e..22613db 100644 --- a/chrome/browser/icon_manager.cc +++ b/chrome/browser/icon_manager.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 6b18a5b..cb023e3 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -12,7 +12,7 @@ #include "base/i18n/icu_string_conversions.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index 876d770..e183f76 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/chrome/browser/importer/firefox3_importer.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index 7404131..d58ba19 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -21,7 +21,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_com_initializer.h" diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index 36d35c1..75fab0e 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 1de2126..11d8827 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -10,7 +10,7 @@ #include "base/debug/leak_tracker.h" #include "base/logging.h" #include "base/metrics/field_trial.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc b/chrome/browser/net/chrome_dns_cert_provenance_checker.cc index d3ea8c4..ba32c5f 100644 --- a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc +++ b/chrome/browser/net/chrome_dns_cert_provenance_checker.cc @@ -5,15 +5,15 @@ #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "net/url_request/url_request.h" namespace { -class ChromeDnsCertProvenanceChecker : - public net::DnsCertProvenanceChecker, - public net::DnsCertProvenanceChecker::Delegate { +class ChromeDnsCertProvenanceChecker + : public net::DnsCertProvenanceChecker, + public net::DnsCertProvenanceChecker::Delegate { public: ChromeDnsCertProvenanceChecker( net::DnsRRResolver* dnsrr_resolver, diff --git a/chrome/browser/net/predictor_api.cc b/chrome/browser/net/predictor_api.cc index 1d63ede..6856327 100644 --- a/chrome/browser/net/predictor_api.cc +++ b/chrome/browser/net/predictor_api.cc @@ -9,7 +9,7 @@ #include "base/lazy_instance.h" #include "base/metrics/field_trial.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc index 354f2db..f3e52cc 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc @@ -6,7 +6,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/test/thread_test_helper.h" #include "base/time.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" diff --git a/chrome/browser/notifications/balloon_collection_base.cc b/chrome/browser/notifications/balloon_collection_base.cc index b0551dde..4e9ab50f 100644 --- a/chrome/browser/notifications/balloon_collection_base.cc +++ b/chrome/browser/notifications/balloon_collection_base.cc @@ -4,7 +4,7 @@ #include "chrome/browser/notifications/balloon_collection_base.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/notification.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/notifications/balloon_collection_impl.cc b/chrome/browser/notifications/balloon_collection_impl.cc index 846bd96..c8bd6bf 100644 --- a/chrome/browser/notifications/balloon_collection_impl.cc +++ b/chrome/browser/notifications/balloon_collection_impl.cc @@ -5,7 +5,7 @@ #include "chrome/browser/notifications/balloon_collection_impl.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_host.h" #include "chrome/browser/notifications/notification.h" diff --git a/chrome/browser/notifications/notification_ui_manager.cc b/chrome/browser/notifications/notification_ui_manager.cc index 2a4060f..2d66214 100644 --- a/chrome/browser/notifications/notification_ui_manager.cc +++ b/chrome/browser/notifications/notification_ui_manager.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/fullscreen.h" #include "chrome/browser/idle.h" diff --git a/chrome/browser/parsers/metadata_parser_manager.cc b/chrome/browser/parsers/metadata_parser_manager.cc index 1cc249c..8336d23 100644 --- a/chrome/browser/parsers/metadata_parser_manager.cc +++ b/chrome/browser/parsers/metadata_parser_manager.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/file_util.h" #include "base/memory/singleton.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "build/build_config.h" #include "chrome/browser/parsers/metadata_parser_factory.h" #include "chrome/browser/parsers/metadata_parser_jpeg_factory.h" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index 9e7c172..064cb33 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/pickle.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "content/browser/browser_thread.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h index f1c48bc..1fd0fbd 100644 --- a/chrome/browser/password_manager/password_form_manager.h +++ b/chrome/browser/password_manager/password_form_manager.h @@ -11,7 +11,7 @@ #include "build/build_config.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 9f98545..1f4bf4d 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -6,7 +6,7 @@ #include <vector> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_manager.h" diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h index ce94a54..6f23a99 100644 --- a/chrome/browser/password_manager/password_manager.h +++ b/chrome/browser/password_manager/password_manager.h @@ -7,7 +7,7 @@ #pragma once #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/ui/login/login_model.h" diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc index 09ed969..dea36e8 100644 --- a/chrome/browser/password_manager/password_store.cc +++ b/chrome/browser/password_manager/password_store.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/password_manager/password_store_default.cc b/chrome/browser/password_manager/password_store_default.cc index d3f66f4..0ebf601 100644 --- a/chrome/browser/password_manager/password_store_default.cc +++ b/chrome/browser/password_manager/password_store_default.cc @@ -7,7 +7,7 @@ #include <set> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 57651c4..f77f01d 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc index 48182e5..033b86c 100644 --- a/chrome/browser/password_manager/password_store_mac.cc +++ b/chrome/browser/password_manager/password_store_mac.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc index 2db2294..67a809a5 100644 --- a/chrome/browser/password_manager/password_store_mac_unittest.cc +++ b/chrome/browser/password_manager/password_store_mac_unittest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/mock_keychain_mac.h" diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 5b21ed2..52349d4 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "chrome/browser/password_manager/ie7_password.h" diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc index 3a621c5..397d509 100644 --- a/chrome/browser/password_manager/password_store_x.cc +++ b/chrome/browser/password_manager/password_store_x.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index efcec40..de9a69f 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/platform_file.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 9cfdb62..6590035 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc index 3a486cf..512307f 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc @@ -5,7 +5,7 @@ #include <gtest/gtest.h> #include "base/mac/scoped_cftyperef.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/configuration_policy_provider_mac.h" diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index b2cc3ce..af2fd2b 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/policy/mock_configuration_policy_provider.cc b/chrome/browser/policy/mock_configuration_policy_provider.cc index 46f997c..d09db10 100644 --- a/chrome/browser/policy/mock_configuration_policy_provider.cc +++ b/chrome/browser/policy/mock_configuration_policy_provider.cc @@ -4,7 +4,7 @@ #include "chrome/browser/policy/mock_configuration_policy_provider.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" namespace policy { diff --git a/chrome/browser/policy/mock_configuration_policy_store.h b/chrome/browser/policy/mock_configuration_policy_store.h index 14e4597..658c82d 100644 --- a/chrome/browser/policy/mock_configuration_policy_store.h +++ b/chrome/browser/policy/mock_configuration_policy_store.h @@ -9,7 +9,7 @@ #include <map> #include <utility> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_store_interface.h" #include "chrome/browser/policy/policy_map.h" diff --git a/chrome/browser/policy/policy_map.cc b/chrome/browser/policy/policy_map.cc index 50c8c42..894d62a 100644 --- a/chrome/browser/policy/policy_map.cc +++ b/chrome/browser/policy/policy_map.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace policy { diff --git a/chrome/browser/prefs/pref_notifier_impl.cc b/chrome/browser/prefs/pref_notifier_impl.cc index cdf67294..2dd454f 100644 --- a/chrome/browser/prefs/pref_notifier_impl.cc +++ b/chrome/browser/prefs/pref_notifier_impl.cc @@ -4,7 +4,7 @@ #include "chrome/browser/prefs/pref_notifier_impl.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "content/common/notification_observer.h" diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index 5c46f2e..cd9dcf8 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/value_conversions.h" diff --git a/chrome/browser/prefs/pref_value_map.cc b/chrome/browser/prefs/pref_value_map.cc index 54967e1..b810519 100644 --- a/chrome/browser/prefs/pref_value_map.cc +++ b/chrome/browser/prefs/pref_value_map.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" PrefValueMap::PrefValueMap() {} diff --git a/chrome/browser/prefs/value_map_pref_store.cc b/chrome/browser/prefs/value_map_pref_store.cc index 39ee3a1..6eeb79b 100644 --- a/chrome/browser/prefs/value_map_pref_store.cc +++ b/chrome/browser/prefs/value_map_pref_store.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" ValueMapPrefStore::ValueMapPrefStore() {} diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index 8ed50c9..9055e59 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -67,7 +67,7 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/safe_strerror_posix.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_split.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index 2995816..2d9b368 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index ccadce3..f917b1a 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/net/chrome_network_delegate.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 2694cc9..e8695f3 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/task.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index dff50d7..bebade40 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 84eca0f..d56e0ab 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -7,7 +7,7 @@ #include <map> #include <utility> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/time.h" #include "chrome/common/safe_browsing/csd.pb.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 479fc77..f9b984a 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/time.h" #include "chrome/common/net/http_return.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index dfc4b82..78c1bab 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/string_util.h" #include "base/task.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index bd6e891..88710ef 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index e14d60f..25ae82a 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_vector.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/search_engines/search_engine_type.h" diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 3c0db83..e60357b 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/environment.h" #include "base/i18n/case_conversion.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 71c75f3..9557af2 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index ba14c5d..ced2639 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sessions/base_session_service.h" #include "base/pickle.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sessions/session_backend_unittest.cc b/chrome/browser/sessions/session_backend_unittest.cc index 61503d4..d28d4f5 100644 --- a/chrome/browser/sessions/session_backend_unittest.cc +++ b/chrome/browser/sessions/session_backend_unittest.cc @@ -4,7 +4,7 @@ #include "base/file_util.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "chrome/browser/sessions/session_backend.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 77f3961..163e488 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -13,7 +13,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 4005728..b748005 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_vector.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/sessions/session_types.h b/chrome/browser/sessions/session_types.h index d597379..e107b3f 100644 --- a/chrome/browser/sessions/session_types.h +++ b/chrome/browser/sessions/session_types.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/time.h" #include "chrome/browser/sessions/session_id.h" diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index 886afbe..7391612 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_helper.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 740e518..7b450bb 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/web_applications/web_app.h" diff --git a/chrome/browser/status_icons/status_tray.cc b/chrome/browser/status_icons/status_tray.cc index 84de8e0..2a72cd6 100644 --- a/chrome/browser/status_icons/status_tray.cc +++ b/chrome/browser/status_icons/status_tray.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/status_icons/status_icon.h" StatusTray::StatusTray() { diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc index 1a2ba36..32e6ce7 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc +++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "chrome/browser/sync/engine/configure_reason.h" #include "chrome/browser/sync/glue/data_type_controller.h" diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc index 2931e94..1a1ca01 100644 --- a/chrome/browser/sync/glue/password_model_associator.cc +++ b/chrome/browser/sync/glue/password_model_associator.cc @@ -6,7 +6,7 @@ #include <set> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_store.h" diff --git a/chrome/browser/sync/notifier/chrome_system_resources.cc b/chrome/browser/sync/notifier/chrome_system_resources.cc index 0965c09..ede395c 100644 --- a/chrome/browser/sync/notifier/chrome_system_resources.cc +++ b/chrome/browser/sync/notifier/chrome_system_resources.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h" diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index 3ac6a79..3c14317 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -6,7 +6,7 @@ #include <string> #include "base/json/json_reader.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "base/task.h" #include "base/tracked.h" diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index e470daf..5065ac8 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/tracked.h" #include "chrome/browser/sessions/session_service.h" diff --git a/chrome/browser/sync/sessions/status_controller.h b/chrome/browser/sync/sessions/status_controller.h index 0f76782..f8c6893 100644 --- a/chrome/browser/sync/sessions/status_controller.h +++ b/chrome/browser/sync/sessions/status_controller.h @@ -36,7 +36,7 @@ #include <vector> #include <map> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/sync/sessions/ordered_commit_set.h" #include "chrome/browser/sync/sessions/session_state.h" diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc index 16b7d0d..d53def0 100644 --- a/chrome/browser/sync/sync_setup_wizard_unittest.cc +++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc @@ -6,7 +6,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/sync/engine/syncapi.h" diff --git a/chrome/browser/sync/syncable/directory_backing_store.cc b/chrome/browser/sync/syncable/directory_backing_store.cc index b5108d2..e256eb8 100644 --- a/chrome/browser/sync/syncable/directory_backing_store.cc +++ b/chrome/browser/sync/syncable/directory_backing_store.cc @@ -16,7 +16,7 @@ #include "base/hash_tables.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc index 892298a5..f05bc6f 100644 --- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc +++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/protocol/sync.pb.h" diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc index 9556b2d..0722c2d 100644 --- a/chrome/browser/sync/syncable/syncable.cc +++ b/chrome/browser/sync/syncable/syncable.cc @@ -34,7 +34,7 @@ #include "base/perftimer.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/time.h" #include "base/tracked.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index b402e29..3cbbcea 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/tabs/tab_finder.cc b/chrome/browser/tabs/tab_finder.cc index 2f06211..ec2ca0e 100644 --- a/chrome/browser/tabs/tab_finder.cc +++ b/chrome/browser/tabs/tab_finder.cc @@ -5,7 +5,7 @@ #include "chrome/browser/tabs/tab_finder.h" #include "base/command_line.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 29d459c..95679c4 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -8,7 +8,7 @@ #include <map> #include "base/command_line.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 72234dd..5e09b6d 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc index 66c9372..3568c29 100644 --- a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc +++ b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc @@ -5,7 +5,7 @@ #include "chrome/browser/task_manager/task_manager_resource_providers.h" #include "base/basictypes.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/balloon_host.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 46ad4e9..006ce75 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -8,7 +8,7 @@ #include "base/file_version_info.h" #include "base/i18n/rtl.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index e43a485..6b1f940 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -4,7 +4,7 @@ #include "chrome/browser/themes/browser_theme_pack.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index f3c5490..33f4b03 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -5,7 +5,7 @@ #include "chrome/browser/ui/cocoa/history_menu_bridge.h" #include "base/callback.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 23d887a..d6cc961 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index 50e74b6..d203431 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -6,7 +6,7 @@ #include <cmath> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc index 7938324..6ac4dd8 100644 --- a/chrome/browser/ui/gtk/global_history_menu.cc +++ b/chrome/browser/ui/gtk/global_history_menu.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.h> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/top_sites.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index e624c02..a09d79a 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -11,7 +11,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc index d120579..9d76219 100644 --- a/chrome/browser/ui/gtk/menu_gtk.cc +++ b/chrome/browser/ui/gtk/menu_gtk.cc @@ -9,7 +9,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/gtk/gtk_custom_menu.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc index 4df64aa..f4c9ccf 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 7202ced..6690a16 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -6,7 +6,7 @@ #include "base/callback.h" #include "base/i18n/rtl.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index a42d65d..3307ea3 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 6a178f2..a3e8cfa 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 04b2487..cc124c8 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/browser_actions_container.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_browser_event_router.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index b87739b..9cacd23 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -9,7 +9,7 @@ #endif #include "base/command_line.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/alternate_nav_url_fetcher.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc index eff832e..f28c49b 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/tabs/dragged_tab_view.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/ui/views/tabs/native_view_photobooth.h" #include "third_party/skia/include/core/SkShader.h" #include "ui/gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index ed5db47..4aa8f0e 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tabs/tab_strip_selection_model.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc index 1b21684..b38c273 100644 --- a/chrome/browser/ui/webui/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extension_icon_source.cc @@ -6,7 +6,7 @@ #include "base/callback.h" #include "base/memory/ref_counted_memory.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc index e4e67e2..d375c56 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc index c452aa7..fcd9ab3 100644 --- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc +++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc @@ -8,7 +8,7 @@ #include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 9ac429f..90505a0 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc index cc77219..637e13a 100644 --- a/chrome/browser/webdata/web_data_service.cc +++ b/chrome/browser/webdata/web_data_service.cc @@ -5,7 +5,7 @@ #include "chrome/browser/webdata/web_data_service.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/threading/thread.h" #include "chrome/browser/autofill/autofill_profile.h" diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 0f7d861..6d83fbf 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc index 4f4d1bd..271ebcd 100644 --- a/chrome/browser/webdata/web_database_migration_unittest.cc +++ b/chrome/browser/webdata/web_database_migration_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/time.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 49dd2db..6585b68 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -14,7 +14,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/chrome/common/extensions/extension_message_bundle.cc b/chrome/common/extensions/extension_message_bundle.cc index a3740a9..ea45721 100644 --- a/chrome/common/extensions/extension_message_bundle.cc +++ b/chrome/common/extensions/extension_message_bundle.cc @@ -12,7 +12,7 @@ #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/common/extensions/update_manifest.cc b/chrome/common/extensions/update_manifest.cc index 713898f..60ac292 100644 --- a/chrome/common/extensions/update_manifest.cc +++ b/chrome/common/extensions/update_manifest.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" diff --git a/chrome/common/sqlite_utils.cc b/chrome/common/sqlite_utils.cc index 15ae2c2..fdbd79b 100644 --- a/chrome/common/sqlite_utils.cc +++ b/chrome/common/sqlite_utils.cc @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/synchronization/lock.h" diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index fcce1ea..8ce4b25 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -9,7 +9,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 6dad7c7..93aee71 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -17,7 +17,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/renderer/autofill/form_manager.cc b/chrome/renderer/autofill/form_manager.cc index 9245a94..d2dda89 100644 --- a/chrome/renderer/autofill/form_manager.cc +++ b/chrome/renderer/autofill/form_manager.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_vector.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" diff --git a/chrome/renderer/extensions/user_script_slave.h b/chrome/renderer/extensions/user_script_slave.h index d35b17d..9e73be7 100644 --- a/chrome/renderer/extensions/user_script_slave.h +++ b/chrome/renderer/extensions/user_script_slave.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "chrome/common/extensions/user_script.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" diff --git a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc index 2e22b19..b77dfc4 100644 --- a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc +++ b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/file_path.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/test/test_timeouts.h" #include "base/test/thread_test_helper.h" #include "chrome/app/chrome_command_ids.h" |