From 3b63f8f451afcf414a59c529f627c620e4d449d9 Mon Sep 17 00:00:00 2001 From: "levin@chromium.org" Date: Mon, 28 Mar 2011 01:54:15 +0000 Subject: 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 --- net/socket_stream/socket_stream.h | 6 +++--- net/socket_stream/socket_stream_job.cc | 4 ++-- net/socket_stream/socket_stream_job.h | 2 +- net/socket_stream/socket_stream_job_manager.cc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'net/socket_stream') diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index 7b7599e..9e85167 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -10,9 +10,9 @@ #include #include -#include "base/linked_ptr.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/linked_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" #include "net/base/address_list.h" diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc index 6636233..b52945a 100644 --- a/net/socket_stream/socket_stream_job.cc +++ b/net/socket_stream/socket_stream_job.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 "net/socket_stream/socket_stream_job.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "net/socket_stream/socket_stream_job_manager.h" namespace net { diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h index 973c20a..9a4577e 100644 --- a/net/socket_stream/socket_stream_job.h +++ b/net/socket_stream/socket_stream_job.h @@ -8,7 +8,7 @@ #include -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "net/socket_stream/socket_stream.h" diff --git a/net/socket_stream/socket_stream_job_manager.cc b/net/socket_stream/socket_stream_job_manager.cc index 105fc3e..7f66a4a 100644 --- a/net/socket_stream/socket_stream_job_manager.cc +++ b/net/socket_stream/socket_stream_job_manager.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 "net/socket_stream/socket_stream_job_manager.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" namespace net { -- cgit v1.1