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

10 files changed, 22 insertions, 22 deletions

diff --git a/remoting/base/capture_data.h b/remoting/base/capture_data.h
index 1922c9c..7169914 100644
--- a/remoting/base/capture_data.h
+++ b/remoting/base/capture_data.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.
 
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/video_frame.h"
 #include "remoting/base/types.h"
 
diff --git a/remoting/base/codec_test.h b/remoting/base/codec_test.h
index 613a537..40f02e2 100644
--- a/remoting/base/codec_test.h
+++ b/remoting/base/codec_test.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 REMOTING_BASE_CODEC_TEST_H_
 #define REMOTING_BASE_CODEC_TEST_H_
 
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/video_frame.h"
 #include "remoting/base/capture_data.h"
 
diff --git a/remoting/base/compound_buffer.h b/remoting/base/compound_buffer.h
index cf92242..b07f40f 100644
--- a/remoting/base/compound_buffer.h
+++ b/remoting/base/compound_buffer.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.
 
@@ -21,7 +21,7 @@
 #include <deque>
 
 #include "base/basictypes.h"
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 
 namespace net {
diff --git a/remoting/base/compound_buffer_unittest.cc b/remoting/base/compound_buffer_unittest.cc
index 2b90bfe..4889c0c 100644
--- a/remoting/base/compound_buffer_unittest.cc
+++ b/remoting/base/compound_buffer_unittest.cc
@@ -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.
 
 #include <string>
 
 #include "base/callback.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "net/base/io_buffer.h"
 #include "remoting/base/compound_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/base/compressor_zlib.h b/remoting/base/compressor_zlib.h
index 3371d22..ba959cf 100644
--- a/remoting/base/compressor_zlib.h
+++ b/remoting/base/compressor_zlib.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 REMOTING_BASE_COMPRESSOR_ZLIB_H_
 #define REMOTING_BASE_COMPRESSOR_ZLIB_H_
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "remoting/base/compressor.h"
 
 typedef struct z_stream_s z_stream;
diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h
index bc55bd5..c82f242 100644
--- a/remoting/base/decoder.h
+++ b/remoting/base/decoder.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.
 
@@ -7,8 +7,8 @@
 
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/task.h"
-#include "base/scoped_ptr.h"
 #include "media/base/video_frame.h"
 #include "remoting/proto/video.pb.h"
 #include "ui/gfx/rect.h"
diff --git a/remoting/base/decompressor_verbatim.h b/remoting/base/decompressor_verbatim.h
index 1dfd2a2..ca712bf 100644
--- a/remoting/base/decompressor_verbatim.h
+++ b/remoting/base/decompressor_verbatim.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 REMOTING_BASE_DECOMPRESSOR_VERBATIM_H_
 #define REMOTING_BASE_DECOMPRESSOR_VERBATIM_H_
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "remoting/base/decompressor.h"
 
 namespace remoting {
diff --git a/remoting/base/decompressor_zlib.h b/remoting/base/decompressor_zlib.h
index b5d122b..007672b 100644
--- a/remoting/base/decompressor_zlib.h
+++ b/remoting/base/decompressor_zlib.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 REMOTING_BASE_DECOMPRESSOR_ZLIB_H_
 #define REMOTING_BASE_DECOMPRESSOR_ZLIB_H_
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "remoting/base/decompressor.h"
 
 typedef struct z_stream_s z_stream;
diff --git a/remoting/base/tracer.cc b/remoting/base/tracer.cc
index ba359d4..a48b582 100644
--- a/remoting/base/tracer.cc
+++ b/remoting/base/tracer.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.
 
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
-#include "base/ref_counted.h"
 #include "base/stl_util-inl.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/threading/thread.h"
diff --git a/remoting/base/tracer.h b/remoting/base/tracer.h
index 2538d0e..0fcbdfa 100644
--- a/remoting/base/tracer.h
+++ b/remoting/base/tracer.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.
 
@@ -53,11 +53,11 @@
 
 #include <string>
 
-#include "base/ref_counted.h"
-#include "base/singleton.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
-#include "base/scoped_ptr.h"
 #include "remoting/proto/trace.pb.h"
 
 namespace remoting {