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

11 files changed, 17 insertions, 17 deletions

diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
index befeb26..5147871 100644
--- a/printing/backend/print_backend.h
+++ b/printing/backend/print_backend.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 
 class DictionaryValue;
 
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index 3b7608c..f2df9b1 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -7,7 +7,7 @@
 #include <objidl.h>
 #include <winspool.h>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 4dda7af..467d4b3 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -6,8 +6,8 @@
 
 #include "base/file_path.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
-#include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "skia/ext/vector_platform_device_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index 2e7c2d0..b401f5b 100644
--- a/printing/emf_win_unittest.cc
+++ b/printing/emf_win_unittest.cc
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
-#include "base/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
 #include "base/win/scoped_hdc.h"
 #include "printing/printing_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/printing/image.cc b/printing/image.cc
index 87a6f7e..5c5213f 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -6,7 +6,7 @@
 
 #include "base/file_util.h"
 #include "base/md5.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "printing/native_metafile_factory.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/printing/native_metafile_factory.cc b/printing/native_metafile_factory.cc
index f31994b..3b77ae0 100644
--- a/printing/native_metafile_factory.cc
+++ b/printing/native_metafile_factory.cc
@@ -4,7 +4,7 @@
 
 #include "printing/native_metafile_factory.h"
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 
 #if defined(OS_WIN)
 #include "printing/emf_win.h"
diff --git a/printing/printed_document.h b/printing/printed_document.h
index 18a6800..b577f47 100644
--- a/printing/printed_document.h
+++ b/printing/printed_document.h
@@ -7,8 +7,8 @@
 
 #include <map>
 
-#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "googleurl/src/gurl.h"
diff --git a/printing/printed_page.h b/printing/printed_page.h
index bd1d123..0fc9069 100644
--- a/printing/printed_page.h
+++ b/printing/printed_page.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2006-2008 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.
 
 #ifndef PRINTING_PRINTED_PAGE_H_
 #define PRINTING_PRINTED_PAGE_H_
 
-#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "printing/native_metafile.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
index 870c380..6c7097c 100644
--- a/printing/printing_context_mac.h
+++ b/printing/printing_context_mac.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/scoped_nsobject.h"
+#include "base/memory/scoped_nsobject.h"
 #include "printing/printing_context.h"
 
 #ifdef __OBJC__
diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
index d949966..98ee8e9 100644
--- a/printing/printing_context_win.h
+++ b/printing/printing_context_win.h
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "printing/printing_context.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index 802ba44..b629b02 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "printing/printing_test.h"
 #include "printing/printing_context.h"
 #include "printing/printing_context_win.h"