diff options
author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
---|---|---|
committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
commit | 3b63f8f451afcf414a59c529f627c620e4d449d9 (patch) | |
tree | 2dcbab1c060b29a260c29bb19b67bf97a8293ca3 /webkit/blob | |
parent | 9174a108509c2aafe513da68e6e63fbc7df38c85 (diff) | |
download | chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.zip chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.gz chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.bz2 |
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
Diffstat (limited to 'webkit/blob')
-rw-r--r-- | webkit/blob/blob_data.h | 4 | ||||
-rw-r--r-- | webkit/blob/blob_storage_controller.h | 4 | ||||
-rw-r--r-- | webkit/blob/blob_storage_controller_unittest.cc | 6 | ||||
-rw-r--r-- | webkit/blob/blob_url_request_job.h | 8 | ||||
-rw-r--r-- | webkit/blob/blob_url_request_job_unittest.cc | 8 | ||||
-rw-r--r-- | webkit/blob/deletable_file_reference.h | 4 | ||||
-rw-r--r-- | webkit/blob/deletable_file_reference_unittest.cc | 4 |
7 files changed, 19 insertions, 19 deletions
diff --git a/webkit/blob/blob_data.h b/webkit/blob/blob_data.h index 9764ce4..587b60b 100644 --- a/webkit/blob/blob_data.h +++ b/webkit/blob/blob_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. @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "webkit/blob/deletable_file_reference.h" diff --git a/webkit/blob/blob_storage_controller.h b/webkit/blob/blob_storage_controller.h index 74bc131b..7f8d45c 100644 --- a/webkit/blob/blob_storage_controller.h +++ b/webkit/blob/blob_storage_controller.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. @@ -6,8 +6,8 @@ #define WEBKIT_BLOB_BLOB_STORAGE_CONTROLLER_H_ #include "base/hash_tables.h" +#include "base/memory/ref_counted.h" #include "base/process.h" -#include "base/ref_counted.h" class GURL; class FilePath; diff --git a/webkit/blob/blob_storage_controller_unittest.cc b/webkit/blob/blob_storage_controller_unittest.cc index 6d6f0d1..884c18a 100644 --- a/webkit/blob/blob_storage_controller_unittest.cc +++ b/webkit/blob/blob_storage_controller_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 "base/file_path.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "net/base/upload_data.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/blob/blob_data.h" diff --git a/webkit/blob/blob_url_request_job.h b/webkit/blob/blob_url_request_job.h index c5669bf..1153f13 100644 --- a/webkit/blob/blob_url_request_job.h +++ b/webkit/blob/blob_url_request_job.h @@ -1,14 +1,14 @@ -// Copyright (c) 20010 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 WEBKIT_BLOB_BLOB_URL_REQUEST_JOB_H_ #define WEBKIT_BLOB_BLOB_URL_REQUEST_JOB_H_ +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_callback_factory.h" +#include "base/memory/scoped_ptr.h" #include "base/platform_file.h" -#include "base/ref_counted.h" -#include "base/scoped_callback_factory.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "net/base/completion_callback.h" #include "net/http/http_byte_range.h" diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index 5d318a3..8fc0af3 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.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,13 +7,13 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop_proxy.h" -#include "base/scoped_temp_dir.h" #include "base/task.h" #include "base/threading/thread.h" #include "base/time.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/synchronization/waitable_event.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" diff --git a/webkit/blob/deletable_file_reference.h b/webkit/blob/deletable_file_reference.h index 9578c10..b432bf0c 100644 --- a/webkit/blob/deletable_file_reference.h +++ b/webkit/blob/deletable_file_reference.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,7 +7,7 @@ #pragma once #include "base/file_path.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace base { class MessageLoopProxy; diff --git a/webkit/blob/deletable_file_reference_unittest.cc b/webkit/blob/deletable_file_reference_unittest.cc index e4208a7..1bd1375 100644 --- a/webkit/blob/deletable_file_reference_unittest.cc +++ b/webkit/blob/deletable_file_reference_unittest.cc @@ -1,13 +1,13 @@ -// 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 "webkit/blob/deletable_file_reference.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/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" namespace webkit_blob { |