diff --git a/base/containers/scoped_ptr_hash_map.h b/base/containers/scoped_ptr_hash_map.h index f513f06ac23f4b..03f25c5b637199 100644 --- a/base/containers/scoped_ptr_hash_map.h +++ b/base/containers/scoped_ptr_hash_map.h @@ -14,7 +14,6 @@ #include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/macros.h" -#include "base/stl_util.h" namespace base { diff --git a/base/json/json_value_converter.h b/base/json/json_value_converter.h index 4cca034f332039..187c4c44db79dd 100644 --- a/base/json/json_value_converter.h +++ b/base/json/json_value_converter.h @@ -15,7 +15,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/stl_util.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "base/values.h" @@ -200,7 +199,7 @@ class ValueFieldConverter : public ValueConverter { public: typedef bool(*ConvertFunc)(const base::Value* value, FieldType* field); - ValueFieldConverter(ConvertFunc convert_func) + explicit ValueFieldConverter(ConvertFunc convert_func) : convert_func_(convert_func) {} bool Convert(const base::Value& value, FieldType* field) const override { @@ -218,7 +217,7 @@ class CustomFieldConverter : public ValueConverter { public: typedef bool(*ConvertFunc)(const StringPiece& value, FieldType* field); - CustomFieldConverter(ConvertFunc convert_func) + explicit CustomFieldConverter(ConvertFunc convert_func) : convert_func_(convert_func) {} bool Convert(const base::Value& value, FieldType* field) const override { @@ -322,7 +321,7 @@ class RepeatedCustomValueConverter public: typedef bool(*ConvertFunc)(const base::Value* value, NestedType* field); - RepeatedCustomValueConverter(ConvertFunc convert_func) + explicit RepeatedCustomValueConverter(ConvertFunc convert_func) : convert_func_(convert_func) {} bool Convert(const base::Value& value, @@ -491,7 +490,7 @@ class JSONValueConverter { if (!value.GetAsDictionary(&dictionary_value)) return false; - for(size_t i = 0; i < fields_.size(); ++i) { + for (size_t i = 0; i < fields_.size(); ++i) { const internal::FieldConverterBase* field_converter = fields_[i]; const base::Value* field = NULL; diff --git a/cc/base/contiguous_container.cc b/cc/base/contiguous_container.cc index b81db9a04e904a..59953b34db4a47 100644 --- a/cc/base/contiguous_container.cc +++ b/cc/base/contiguous_container.cc @@ -6,6 +6,7 @@ #include +#include #include namespace cc { diff --git a/cc/base/contiguous_container.h b/cc/base/contiguous_container.h index c876508cff0ba2..d0285fcf8f00f4 100644 --- a/cc/base/contiguous_container.h +++ b/cc/base/contiguous_container.h @@ -9,11 +9,11 @@ #include #include +#include #include "base/compiler_specific.h" #include "base/logging.h" #include "base/macros.h" -#include "base/stl_util.h" #include "cc/base/cc_export.h" namespace cc { diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h index 1e48fba05dc69e..7ae81df0781cca 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h @@ -12,7 +12,6 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/stl_util.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "google_apis/gaia/gaia_oauth_client.h" #include "google_apis/gaia/oauth2_token_service_delegate.h" diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h index 42243af37402c1..60d25a6760f514 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h @@ -12,7 +12,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" -#include "base/stl_util.h" #include "chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h" #include "chrome/browser/extensions/api/image_writer_private/operation.h" #include "chrome/common/extensions/api/image_writer_private.h" @@ -91,7 +90,6 @@ class OperationManager : public BrowserContextKeyedAPI, static OperationManager* Get(content::BrowserContext* context); private: - static const char* service_name() { return "OperationManager"; } diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h index 90218a5a8d6d80..208dc905d524e8 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h @@ -10,7 +10,6 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/stl_util.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/components/password_manager/core/browser/password_manager.h b/components/password_manager/core/browser/password_manager.h index dcf58955fc6dbe..f617cb0ef07a1c 100644 --- a/components/password_manager/core/browser/password_manager.h +++ b/components/password_manager/core/browser/password_manager.h @@ -13,7 +13,6 @@ #include "base/callback.h" #include "base/macros.h" #include "base/observer_list.h" -#include "base/stl_util.h" #include "base/strings/string16.h" #include "build/build_config.h" #include "components/autofill/core/common/password_form.h" diff --git a/components/sync/api/sync_data.h b/components/sync/api/sync_data.h index 2ebd47e52a101a..5c570bd6b0b9a6 100644 --- a/components/sync/api/sync_data.h +++ b/components/sync/api/sync_data.h @@ -13,7 +13,6 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/stl_util.h" #include "base/time/time.h" #include "components/sync/api/attachments/attachment_id.h" #include "components/sync/base/immutable.h" diff --git a/components/sync/engine_impl/cycle/status_controller.h b/components/sync/engine_impl/cycle/status_controller.h index ab695534602fac..24e7182da11508 100644 --- a/components/sync/engine_impl/cycle/status_controller.h +++ b/components/sync/engine_impl/cycle/status_controller.h @@ -22,7 +22,6 @@ #include "base/logging.h" #include "base/macros.h" -#include "base/stl_util.h" #include "base/time/time.h" #include "components/sync/engine/cycle/model_neutral_state.h" #include "components/sync/engine/model_safe_worker.h" diff --git a/content/browser/accessibility/ax_tree_id_registry.h b/content/browser/accessibility/ax_tree_id_registry.h index fcb22e6f12ffc6..7ef4fdabb72dbb 100644 --- a/content/browser/accessibility/ax_tree_id_registry.h +++ b/content/browser/accessibility/ax_tree_id_registry.h @@ -6,9 +6,9 @@ #define CONTENT_BROWSER_ACCESSIBILITY_AX_TREE_ID_REGISTRY_H_ #include +#include #include "base/macros.h" -#include "base/stl_util.h" namespace base { template @@ -20,9 +20,9 @@ namespace content { // A class which generates a unique id given a process id and frame routing id. class AXTreeIDRegistry { public: - typedef std::pair FrameID; + using FrameID = std::pair; - typedef int AXTreeID; + using AXTreeID = int; static const AXTreeID kNoAXTreeID; diff --git a/content/browser/indexed_db/indexed_db_observer_changes.h b/content/browser/indexed_db/indexed_db_observer_changes.h index 61e31edaca5248..9a73b55c7c8755 100644 --- a/content/browser/indexed_db/indexed_db_observer_changes.h +++ b/content/browser/indexed_db/indexed_db_observer_changes.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include "base/macros.h" diff --git a/extensions/browser/updater/request_queue_impl.h b/extensions/browser/updater/request_queue_impl.h index 53276398382998..c8e0a8c962db32 100644 --- a/extensions/browser/updater/request_queue_impl.h +++ b/extensions/browser/updater/request_queue_impl.h @@ -8,12 +8,12 @@ #include #include +#include #include #include "base/bind.h" #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" -#include "base/stl_util.h" #include "extensions/browser/updater/request_queue.h" namespace extensions { diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index b93ff45d633c93..159e36f117579f 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -13,7 +13,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop/message_loop.h" #include "base/power_monitor/power_observer.h" #include "net/base/host_port_pair.h" #include "net/base/load_states.h" diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h index 4cdbe229eef397..2b454d776dea58 100644 --- a/ui/accessibility/ax_tree_serializer.h +++ b/ui/accessibility/ax_tree_serializer.h @@ -8,11 +8,10 @@ #include #include -#include +#include #include "base/containers/hash_tables.h" #include "base/logging.h" -#include "base/stl_util.h" #include "ui/accessibility/ax_export.h" #include "ui/accessibility/ax_tree_source.h" #include "ui/accessibility/ax_tree_update.h"