diff options
36 files changed, 54 insertions, 51 deletions
diff --git a/chrome/browser/browser_main.h b/chrome/browser/browser_main.h index a663a39..e4c1da21 100644 --- a/chrome/browser/browser_main.h +++ b/chrome/browser/browser_main.h @@ -10,7 +10,6 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" -#include "base/scoped_ptr.h" #include "base/tracked_objects.h" class BrowserThread; diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h index 842d7c8..1f28f8d 100644 --- a/chrome/browser/chromeos/cros/network_library.h +++ b/chrome/browser/chromeos/cros/network_library.h @@ -10,10 +10,10 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/string16.h" #include "base/timer.h" #include "third_party/cros/chromeos_network.h" diff --git a/chrome/browser/chromeos/cros/network_parser.h b/chrome/browser/chromeos/cros/network_parser.h index 6d4c900..9181551 100644 --- a/chrome/browser/chromeos/cros/network_parser.h +++ b/chrome/browser/chromeos/cros/network_parser.h @@ -9,7 +9,7 @@ #include <string> #include <map> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/cros/network_library.h" namespace base { diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index 66a2e33..3c0b774 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -706,4 +706,3 @@ ComponentUpdateService* ComponentUpdateServiceFactory( DCHECK(config); return new CrxUpdateService(config); } - diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index e4faf955..85ad9c9 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -11,8 +11,8 @@ #include "base/auto_reset.h" #include "base/command_line.h" +#include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/scoped_ptr.h" #include "chrome/browser/content_settings/content_settings_pattern.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index ae7a986..e952449 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/extension_content_settings_helpers.cc b/chrome/browser/extensions/extension_content_settings_helpers.cc index bb24955..df82f4a 100644 --- a/chrome/browser/extensions/extension_content_settings_helpers.cc +++ b/chrome/browser/extensions/extension_content_settings_helpers.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/url_pattern.h" #include "content/common/url_constants.h" @@ -145,4 +145,3 @@ const char* ContentSettingToString(ContentSetting setting) { } } // namespace extension_content_settings_helpers - diff --git a/chrome/browser/extensions/extension_settings_leveldb_storage.h b/chrome/browser/extensions/extension_settings_leveldb_storage.h index 699b8b4..b169437 100644 --- a/chrome/browser/extensions/extension_settings_leveldb_storage.h +++ b/chrome/browser/extensions/extension_settings_leveldb_storage.h @@ -6,10 +6,12 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_LEVELDB_STORAGE_H_ #pragma once +#include <string> + #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/extensions/extension_settings_storage.h" #include "third_party/leveldb/include/leveldb/db.h" diff --git a/chrome/browser/extensions/extension_tts_api_controller.h b/chrome/browser/extensions/extension_tts_api_controller.h index 51fe516..e536e59 100644 --- a/chrome/browser/extensions/extension_tts_api_controller.h +++ b/chrome/browser/extensions/extension_tts_api_controller.h @@ -9,8 +9,8 @@ #include <set> #include <string> +#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/scoped_ptr.h" #include "googleurl/src/gurl.h" class Extension; diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc index 18becbd..f8d201c 100644 --- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc +++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_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/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h" #include "chrome/browser/intents/web_intents_registry.h" diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h index d85cfbd..8f8f97c 100644 --- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h +++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h @@ -12,9 +12,9 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_callback_factory.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "google/cacheinvalidation/v2/system-resources.h" diff --git a/chrome/browser/sync/syncable/model_type_payload_map.cc b/chrome/browser/sync/syncable/model_type_payload_map.cc index 288d8ff..545eb4ad 100644 --- a/chrome/browser/sync/syncable/model_type_payload_map.cc +++ b/chrome/browser/sync/syncable/model_type_payload_map.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/syncable/model_type_payload_map.h" -#include "chrome/browser/sync/engine/model_safe_worker.h" +#include <vector> #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h index 2537d8e..5fba25e 100644 --- a/chrome/browser/translate/translate_manager.h +++ b/chrome/browser/translate/translate_manager.h @@ -12,7 +12,7 @@ #include <vector> #include "base/lazy_instance.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/common/translate_errors.h" diff --git a/chrome/browser/ui/panels/panel_mouse_watcher_win.cc b/chrome/browser/ui/panels/panel_mouse_watcher_win.cc index 8a83087..590125b 100644 --- a/chrome/browser/ui/panels/panel_mouse_watcher_win.cc +++ b/chrome/browser/ui/panels/panel_mouse_watcher_win.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/panels/panel_mouse_watcher_win.h" +#include <windows.h> + #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_manager.h" -#include <windows.h> - namespace { HMODULE GetModuleHandleFromAddress(void *address) { @@ -79,7 +79,7 @@ void PanelMouseWatcherWin::OnMouseAction(int mouse_x, int mouse_y) { panel_manager->BringUpOrDownTitlebarForAllMinimizedPanels(bring_up_titlebar); } -} +} // namespace void EnsureMouseWatcherStarted() { if (!mouse_watcher.get()) diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 22950a5..e0c004f 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -4,8 +4,10 @@ #include "chrome/browser/ui/views/infobars/infobar_view.h" +#include <algorithm> + +#include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" -#include "base/scoped_ptr.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/ui/views/infobars/infobar_background.h" #include "chrome/browser/ui/views/infobars/infobar_button_border.h" diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h index 1eba110..5cc8202 100644 --- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/chromeos/login/enterprise_enrollment_screen_actor.h" #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc index 5fee3c8..2ff09d6 100644 --- a/chrome/browser/ui/webui/tracing_ui.cc +++ b/chrome/browser/ui/webui/tracing_ui.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/file_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h index bf9a564..7bf0cfb 100644 --- a/chrome/common/extensions/extension_permission_set.h +++ b/chrome/common/extensions/extension_permission_set.h @@ -12,9 +12,9 @@ #include <vector> #include "base/gtest_prod_util.h" -#include "base/memory/singleton.h" #include "base/memory/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/singleton.h" #include "base/string16.h" #include "chrome/common/extensions/url_pattern_set.h" diff --git a/chrome/tools/ipclist/ipcfuzz.cc b/chrome/tools/ipclist/ipcfuzz.cc index 91a3d2e..c094cd9 100644 --- a/chrome/tools/ipclist/ipcfuzz.cc +++ b/chrome/tools/ipclist/ipcfuzz.cc @@ -9,11 +9,11 @@ #include "base/command_line.h" #include "base/hash_tables.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/pickle.h" #include "base/process_util.h" -#include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/threading/thread.h" @@ -60,7 +60,7 @@ class Fuzzer { virtual void FuzzBytes(void* data, int data_len) = 0; }; -} // Namespace IPC +} // namespace IPC namespace { @@ -90,7 +90,7 @@ void FuzzStringType(T* value, unsigned int frequency, } } -} // Namespace +} // namespace // One such fuzzer implementation. class DefaultFuzzer : public IPC::Fuzzer { @@ -115,8 +115,7 @@ class DefaultFuzzer : public IPC::Fuzzer { srand(new_seed); } - if ((env_var = getenv("CHROME_IPC_FUZZING_FREQUENCY"))) - { + if ((env_var = getenv("CHROME_IPC_FUZZING_FREQUENCY"))) { unsigned int new_frequency = atoi(env_var); if (new_frequency) frequency_ = new_frequency; @@ -685,4 +684,3 @@ extern "C" { IPC::ChannelProxy::OutgoingMessageFilter* GetFilter(void) { return &g_ipcfuzz; } - diff --git a/content/browser/debugger/worker_devtools_manager_io.h b/content/browser/debugger/worker_devtools_manager_io.h index 6f96b87..19b4388 100644 --- a/content/browser/debugger/worker_devtools_manager_io.h +++ b/content/browser/debugger/worker_devtools_manager_io.h @@ -7,8 +7,8 @@ #pragma once #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/scoped_ptr.h" namespace IPC { class Message; diff --git a/crypto/encryptor.h b/crypto/encryptor.h index 0de6358..a407266 100644 --- a/crypto/encryptor.h +++ b/crypto/encryptor.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_piece.h" #include "build/build_config.h" #include "crypto/crypto_export.h" @@ -35,7 +35,7 @@ class CRYPTO_EXPORT Encryptor { // Only 128-bits counter is supported in this class. class Counter { public: - Counter(const base::StringPiece& counter); + explicit Counter(const base::StringPiece& counter); ~Counter(); // Increment the counter value. diff --git a/crypto/sha2.cc b/crypto/sha2.cc index 7626bdc..a757df6 100644 --- a/crypto/sha2.cc +++ b/crypto/sha2.cc @@ -4,7 +4,7 @@ #include "crypto/sha2.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "crypto/secure_hash.h" diff --git a/media/base/media_log.cc b/media/base/media_log.cc index 95b9e8b..e829d1f 100644 --- a/media/base/media_log.cc +++ b/media/base/media_log.cc @@ -4,9 +4,11 @@ #include "media/base/media_log.h" +#include <string> + #include "base/atomic_sequence_num.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" namespace media { diff --git a/media/filters/chunk_demuxer_factory.h b/media/filters/chunk_demuxer_factory.h index a3d004a..b1124d5 100644 --- a/media/filters/chunk_demuxer_factory.h +++ b/media/filters/chunk_demuxer_factory.h @@ -5,7 +5,9 @@ #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_FACTORY_H_ #define MEDIA_FILTERS_CHUNK_DEMUXER_FACTORY_H_ -#include "base/scoped_ptr.h" +#include <string> + +#include "base/memory/scoped_ptr.h" #include "media/base/filter_factories.h" namespace media { diff --git a/media/webm/cluster_builder.h b/media/webm/cluster_builder.h index aef9d8e..132da8a 100644 --- a/media/webm/cluster_builder.h +++ b/media/webm/cluster_builder.h @@ -6,7 +6,7 @@ #define MEDIA_WEBM_CLUSTER_BUILDER_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "media/base/buffers.h" namespace media { diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h index 98c5854..0266086 100644 --- a/media/webm/webm_cluster_parser.h +++ b/media/webm/webm_cluster_parser.h @@ -6,8 +6,9 @@ #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ #include <deque> +#include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "media/base/buffers.h" #include "media/webm/webm_parser.h" @@ -44,8 +45,8 @@ class WebMClusterParser : public WebMParserClient { virtual bool OnSimpleBlock(int track_num, int timecode, int flags, const uint8* data, int size); - double timecode_multiplier_; // Multiplier used to convert timecodes into - // microseconds. + double timecode_multiplier_; // Multiplier used to convert timecodes into + // microseconds. int audio_track_num_; base::TimeDelta audio_default_duration_; int video_track_num_; @@ -62,4 +63,4 @@ class WebMClusterParser : public WebMParserClient { } // namespace media -#endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ +#endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h index 94fd95d..9a33ae4 100644 --- a/net/dns/dns_transaction.h +++ b/net/dns/dns_transaction.h @@ -12,7 +12,7 @@ #include <vector> #include "base/gtest_prod_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "base/threading/non_thread_safe.h" #include "net/base/completion_callback.h" diff --git a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc index 5e5a272..1be870c 100644 --- a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc +++ b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc @@ -9,8 +9,8 @@ #include <map> #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/plugin_dispatcher.h" diff --git a/ppapi/shared_impl/font_impl.h b/ppapi/shared_impl/font_impl.h index 9117ffb..9496b16 100644 --- a/ppapi/shared_impl/font_impl.h +++ b/ppapi/shared_impl/font_impl.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_stdint.h" diff --git a/ppapi/tests/test_transport.h b/ppapi/tests/test_transport.h index 2f3a8147..9d1f3eb 100644 --- a/ppapi/tests/test_transport.h +++ b/ppapi/tests/test_transport.h @@ -7,7 +7,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ppapi/tests/test_case.h" struct PPB_Transport_Dev; diff --git a/printing/pdf_metafile_skia.h b/printing/pdf_metafile_skia.h index d3beb3b..d4ce56f 100644 --- a/printing/pdf_metafile_skia.h +++ b/printing/pdf_metafile_skia.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "printing/metafile.h" diff --git a/ui/gfx/canvas_skia_win.cc b/ui/gfx/canvas_skia_win.cc index 76fe318..001c55b 100644 --- a/ui/gfx/canvas_skia_win.cc +++ b/ui/gfx/canvas_skia_win.cc @@ -8,7 +8,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/win/scoped_gdi_object.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/skia_utils_win.h" diff --git a/ui/gfx/native_theme_win.cc b/ui/gfx/native_theme_win.cc index 25f11d0..23a5e50 100644 --- a/ui/gfx/native_theme_win.cc +++ b/ui/gfx/native_theme_win.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_handle.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/win/scoped_gdi_object.h" #include "base/win/scoped_hdc.h" #include "base/win/windows_version.h" diff --git a/views/ime/input_method_ibus.h b/views/ime/input_method_ibus.h index 0d181d1..2402f6a 100644 --- a/views/ime/input_method_ibus.h +++ b/views/ime/input_method_ibus.h @@ -7,10 +7,11 @@ #pragma once #include <set> +#include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/base/gtk/gtk_signal.h" #include "views/events/event.h" #include "views/ime/character_composer.h" diff --git a/views/layer_property_setter.cc b/views/layer_property_setter.cc index e5b6e94..12061f3 100644 --- a/views/layer_property_setter.cc +++ b/views/layer_property_setter.cc @@ -4,7 +4,7 @@ #include "views/layer_property_setter.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/compositor/layer_animator.h" diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h index 7f5bdc0..1a1bd3f 100644 --- a/webkit/glue/webkitclient_impl.h +++ b/webkit/glue/webkitclient_impl.h @@ -6,7 +6,6 @@ #define WEBKIT_CLIENT_IMPL_H_ #include "base/platform_file.h" -#include "base/scoped_ptr.h" #include "base/timer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h" #if defined(OS_WIN) |