Move some files from base to base/memory.

raw_scoped_refptr_mismatch_checker.h
ref_counted.cc
ref_counted.h
ref_counted_memory.cc
ref_counted_memory.h
ref_counted_unittest.cc
scoped_callback_factory.h
scoped_comptr_win.h
scoped_handle.h
scoped_native_library.cc
scoped_native_library.h
scoped_native_library_unittest.cc
scoped_nsobject.h
scoped_open_process.h
scoped_ptr.h
scoped_ptr_unittest.cc
scoped_temp_dir.cc
scoped_temp_dir.h
scoped_temp_dir_unittest.cc
scoped_vector.h
singleton.h
singleton_objc.h
singleton_unittest.cc
linked_ptr.h
linked_ptr_unittest.cc
weak_ptr.cc
weak_ptr.h
weak_ptr_unittest.cc

BUG=None
TEST=Compile

Review URL: http://codereview.chromium.org/6714032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79524 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 23 insertions, 23 deletions

diff --git a/content/common/child_process.h b/content/common/child_process.h
index d7e9a00..4c5dc67 100644
--- a/content/common/child_process.h
+++ b/content/common/child_process.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
 
diff --git a/content/common/child_process_host.h b/content/common/child_process_host.h
index 67b14b5..bb15134 100644
--- a/content/common/child_process_host.h
+++ b/content/common/child_process_host.h
@@ -16,7 +16,7 @@
 #endif  // defined(OS_WIN)
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/common/notification_type.h"
 #include "ipc/ipc_channel_proxy.h"
 
diff --git a/content/common/child_thread.h b/content/common/child_thread.h
index 33488fe..4b27ab7 100644
--- a/content/common/child_thread.h
+++ b/content/common/child_thread.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/common/message_router.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
diff --git a/content/common/chrome_application_mac.h b/content/common/chrome_application_mac.h
index 23178ff..80e2c4a 100644
--- a/content/common/chrome_application_mac.h
+++ b/content/common/chrome_application_mac.h
@@ -11,8 +11,8 @@
 #import <AppKit/AppKit.h>
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_nsobject.h"
 #include "base/message_pump_mac.h"
-#include "base/scoped_nsobject.h"
 
 // Event hooks must implement this protocol.
 @protocol CrApplicationEventHookProtocol
diff --git a/content/common/common_param_traits.h b/content/common/common_param_traits.h
index d25ba12..cc60d5d 100644
--- a/content/common/common_param_traits.h
+++ b/content/common/common_param_traits.h
@@ -14,8 +14,8 @@
 #define CONTENT_COMMON_COMMON_PARAM_TRAITS_H_
 #pragma once
 
+#include "base/memory/ref_counted.h"
 #include "base/platform_file.h"
-#include "base/ref_counted.h"
 #include "base/string_number_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_utils.h"
diff --git a/content/common/file_path_watcher/file_path_watcher.h b/content/common/file_path_watcher/file_path_watcher.h
index 1a8da91..2ec7af5 100644
--- a/content/common/file_path_watcher/file_path_watcher.h
+++ b/content/common/file_path_watcher/file_path_watcher.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
-#include "base/ref_counted.h"
 
 // This class lets you register interest in changes on a FilePath.
 // The delegate will get called whenever the file or directory referenced by the
diff --git a/content/common/file_path_watcher/file_path_watcher_browsertest.cc b/content/common/file_path_watcher/file_path_watcher_browsertest.cc
index 8480741..c91e690 100644
--- a/content/common/file_path_watcher/file_path_watcher_browsertest.cc
+++ b/content/common/file_path_watcher/file_path_watcher_browsertest.cc
@@ -10,10 +10,10 @@
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.h"
 #include "base/synchronization/waitable_event.h"
diff --git a/content/common/file_path_watcher/file_path_watcher_inotify.cc b/content/common/file_path_watcher/file_path_watcher_inotify.cc
index e4017e9..50d7342 100644
--- a/content/common/file_path_watcher/file_path_watcher_inotify.cc
+++ b/content/common/file_path_watcher/file_path_watcher_inotify.cc
@@ -22,9 +22,9 @@
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "base/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
diff --git a/content/common/file_path_watcher/file_path_watcher_mac.cc b/content/common/file_path_watcher/file_path_watcher_mac.cc
index c8cfc6b..ba0c1c3 100644
--- a/content/common/file_path_watcher/file_path_watcher_mac.cc
+++ b/content/common/file_path_watcher/file_path_watcher_mac.cc
@@ -11,8 +11,8 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/memory/singleton.h"
 #include "base/message_loop.h"
-#include "base/singleton.h"
 #include "base/time.h"
 
 // Note to future well meaning engineers. Unless kqueue semantics have changed
diff --git a/content/common/file_path_watcher/file_path_watcher_win.cc b/content/common/file_path_watcher/file_path_watcher_win.cc
index dc36958..448e857 100644
--- a/content/common/file_path_watcher/file_path_watcher_win.cc
+++ b/content/common/file_path_watcher/file_path_watcher_win.cc
@@ -7,8 +7,8 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
-#include "base/ref_counted.h"
 #include "base/time.h"
 #include "base/win/object_watcher.h"
 
diff --git a/content/common/file_system/webfilewriter_impl.h b/content/common/file_system/webfilewriter_impl.h
index 2be2437..fa34eaf 100644
--- a/content/common/file_system/webfilewriter_impl.h
+++ b/content/common/file_system/webfilewriter_impl.h
@@ -5,8 +5,8 @@
 #ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
 #define CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
 
-#include "base/ref_counted.h"
-#include "base/weak_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "webkit/fileapi/webfilewriter_base.h"
 
 class FileSystemDispatcher;
diff --git a/content/common/process_watcher_win.cc b/content/common/process_watcher_win.cc
index c1ccbf8..95cf982 100644
--- a/content/common/process_watcher_win.cc
+++ b/content/common/process_watcher_win.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/process_watcher.h"
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/win/object_watcher.h"
 #include "content/common/result_codes.h"
diff --git a/content/common/property_bag.cc b/content/common/property_bag.cc
index 9446bf4..ec3cc5c 100644
--- a/content/common/property_bag.cc
+++ b/content/common/property_bag.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/linked_ptr.h"
+#include "base/memory/linked_ptr.h"
 #include "content/common/property_bag.h"
 
 PropertyBag::PropertyBag() {
diff --git a/content/common/resource_dispatcher.h b/content/common/resource_dispatcher.h
index 4f5c215..83fa4511 100644
--- a/content/common/resource_dispatcher.h
+++ b/content/common/resource_dispatcher.h
@@ -12,7 +12,7 @@
 #include <string>
 
 #include "base/hash_tables.h"
-#include "base/linked_ptr.h"
+#include "base/memory/linked_ptr.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "ipc/ipc_channel.h"
diff --git a/content/common/resource_dispatcher_unittest.cc b/content/common/resource_dispatcher_unittest.cc
index 659537e..c92ab5e 100644
--- a/content/common/resource_dispatcher_unittest.cc
+++ b/content/common/resource_dispatcher_unittest.cc
@@ -5,10 +5,10 @@
 #include <string>
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process.h"
 #include "base/process_util.h"
-#include "base/scoped_ptr.h"
 #include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_response.h"
diff --git a/content/common/resource_response.h b/content/common/resource_response.h
index 49c9934..0473e32 100644
--- a/content/common/resource_response.h
+++ b/content/common/resource_response.h
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"
 #include "webkit/glue/resource_loader_bridge.h"
diff --git a/content/common/sandbox_mac_fontloading_unittest.mm b/content/common/sandbox_mac_fontloading_unittest.mm
index 7df1bfe..f6518a2 100644
--- a/content/common/sandbox_mac_fontloading_unittest.mm
+++ b/content/common/sandbox_mac_fontloading_unittest.mm
@@ -7,7 +7,7 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "content/common/font_loader_mac.h"
 #include "content/common/sandbox_mac_unittest_helper.h"
diff --git a/content/common/sandbox_mac_unittest_helper.mm b/content/common/sandbox_mac_unittest_helper.mm
index 6b485de..564cc8b 100644
--- a/content/common/sandbox_mac_unittest_helper.mm
+++ b/content/common/sandbox_mac_unittest_helper.mm
@@ -12,7 +12,7 @@ extern "C" {
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/common/sandbox_mac.h"
 #include "testing/multiprocess_func_list.h"
 
diff --git a/content/common/socket_stream_dispatcher.cc b/content/common/socket_stream_dispatcher.cc
index 583b5f7..344d0b2 100644
--- a/content/common/socket_stream_dispatcher.cc
+++ b/content/common/socket_stream_dispatcher.cc
@@ -7,8 +7,8 @@
 #include <vector>
 
 #include "base/id_map.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "base/ref_counted.h"
 #include "base/task.h"
 #include "content/common/child_thread.h"
 #include "content/common/socket_stream.h"
diff --git a/content/common/webblobregistry_impl.cc b/content/common/webblobregistry_impl.cc
index c8568ed..7a6a1ea 100644
--- a/content/common/webblobregistry_impl.cc
+++ b/content/common/webblobregistry_impl.cc
@@ -4,7 +4,7 @@
 
 #include "content/common/webblobregistry_impl.h"
 
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "content/common/webblob_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/content/common/webmessageportchannel_impl.h b/content/common/webmessageportchannel_impl.h
index e947050..adde1a4 100644
--- a/content/common/webmessageportchannel_impl.h
+++ b/content/common/webmessageportchannel_impl.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
 #include "base/string16.h"
-#include "base/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel.h"