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

4 files changed, 8 insertions, 8 deletions

diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/scoped_ptr.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/scoped_ptr.h
index 021d2dd..c31eb43e 100644
--- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/scoped_ptr.h
+++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/scoped_ptr.h
@@ -1,11 +1,11 @@
-// 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.
 
 #ifndef GOOGLE_CACHEINVALIDATION_SCOPED_PTR_H_
 #define GOOGLE_CACHEINVALIDATION_SCOPED_PTR_H_
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 
 namespace invalidation {
 
diff --git a/third_party/cld/base/logging.h b/third_party/cld/base/logging.h
index d03e1dc..ba81ced 100644
--- a/third_party/cld/base/logging.h
+++ b/third_party/cld/base/logging.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 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.
 
@@ -22,7 +22,7 @@
 #include "base/crash.h"
 #include "base/dynamic_annotations.h"
 #include "base/macros.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/stl_decl_msvc.h"
 #include "base/log_severity.h"
 #include "base/vlog_is_on.h"
diff --git a/third_party/libjingle/overrides/talk/base/scoped_ptr.h b/third_party/libjingle/overrides/talk/base/scoped_ptr.h
index cc4fec9..3d396d1 100644
--- a/third_party/libjingle/overrides/talk/base/scoped_ptr.h
+++ b/third_party/libjingle/overrides/talk/base/scoped_ptr.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2009 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.
 
-// This file overrides the inclusion of talk/base/scoped_ptr.h.  We use
+// This file overrides the inclusion of talk/base/memory/scoped_ptr.h.  We use
 // a version of scoped_ptr from Chromium base, to avoid multiple definitions.
 
 #ifndef OVERRIDES_TALK_BASE_SCOPED_PTR_H_
 #define OVERRIDES_TALK_BASE_SCOPED_PTR_H_
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "talk/base/common.h"
 
 namespace talk_base {
diff --git a/third_party/protobuf/src/google/protobuf/stubs/common.h b/third_party/protobuf/src/google/protobuf/stubs/common.h
index 749e6e9..2ffe035 100644
--- a/third_party/protobuf/src/google/protobuf/stubs/common.h
+++ b/third_party/protobuf/src/google/protobuf/stubs/common.h
@@ -411,7 +411,7 @@ struct CompileAssert {
 //   causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
 
 // ===================================================================
-// from google3/base/scoped_ptr.h
+// from google3/base/memory/scoped_ptr.h
 
 namespace internal {