Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 4)

BUG=none TEST=none Review URL: http://codereview.chromium.org/7670016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97286 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Aug 18, 2011 · 7226b33 · 7226b33
1 parent 87b5768
commit 7226b33
Show file tree

Hide file tree

Showing 36 changed files with 54 additions and 51 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"