Skip to content

Commit

Permalink
Move some files from base to base/memory.
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
levin@chromium.org committed Mar 28, 2011
1 parent 9174a10 commit 3b63f8f
Show file tree
Hide file tree
Showing 2,410 changed files with 4,880 additions and 4,852 deletions.
4 changes: 2 additions & 2 deletions app/gfx/gl/gl_context_egl.cc
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// 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 "app/gfx/gl/gl_context_egl.h"

#include "build/build_config.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "third_party/angle/include/EGL/egl.h"

// This header must come after the above third-party include, as
Expand Down
4 changes: 2 additions & 2 deletions app/gfx/gl/gl_context_egl.h
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -7,7 +7,7 @@
#pragma once

#include "app/gfx/gl/gl_context.h"
#include "base/ref_counted.h"
#include "base/memory/ref_counted.h"
#include "ui/gfx/size.h"

typedef void* EGLDisplay;
Expand Down
4 changes: 2 additions & 2 deletions app/gfx/gl/gl_context_linux.cc
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -19,7 +19,7 @@ extern "C" {
#include "app/gfx/gl/gl_implementation.h"
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "ui/base/x/x11_util.h"

namespace {
Expand Down
4 changes: 2 additions & 2 deletions app/gfx/gl/gl_context_mac.cc
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -15,7 +15,7 @@
#include "app/gfx/gl/gl_implementation.h"
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"

namespace gfx {

Expand Down
4 changes: 2 additions & 2 deletions app/gfx/gl/gl_context_osmesa.h
View file
Original file line number Diff line number Diff line change
@@ -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.

#ifndef APP_GFX_GL_GL_CONTEXT_OSMESA_H_
#define APP_GFX_GL_GL_CONTEXT_OSMESA_H_
#pragma once

#include "base/scoped_ptr.h"
#include "app/gfx/gl/gl_context.h"
#include "base/memory/scoped_ptr.h"
#include "ui/gfx/size.h"

typedef struct osmesa_context *OSMesaContext;
Expand Down
4 changes: 2 additions & 2 deletions app/gfx/gl/gl_context_win.cc
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -17,7 +17,7 @@
#include "app/gfx/gl/gl_implementation.h"

#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"

namespace gfx {

Expand Down
4 changes: 2 additions & 2 deletions app/sql/connection.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 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.

Expand All @@ -11,7 +11,7 @@
#include <string>

#include "base/basictypes.h"
#include "base/ref_counted.h"
#include "base/memory/ref_counted.h"
#include "base/time.h"

class FilePath;
Expand Down
4 changes: 2 additions & 2 deletions app/sql/statement.h
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -11,7 +11,7 @@

#include "app/sql/connection.h"
#include "base/basictypes.h"
#include "base/ref_counted.h"
#include "base/memory/ref_counted.h"
#include "base/string16.h"

namespace sql {
Expand Down
4 changes: 2 additions & 2 deletions base/atomic_ref_count.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// 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.

// This is a low level implementation of atomic semantics for reference
// counting. Please use base/ref_counted.h directly instead.
// counting. Please use base/memory/ref_counted.h directly instead.
//
// The implementation includes annotations to avoid some false positives
// when using data race detection tools.
Expand Down
14 changes: 7 additions & 7 deletions base/base.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,15 @@
'json/string_escape_unittest.cc',
'lazy_instance_unittest.cc',
'linked_list_unittest.cc',
'linked_ptr_unittest.cc',
'logging_unittest.cc',
'mac/mac_util_unittest.mm',
'memory/linked_ptr_unittest.cc',
'memory/ref_counted_unittest.cc',
'memory/scoped_native_library_unittest.cc',
'memory/scoped_ptr_unittest.cc',
'memory/scoped_temp_dir_unittest.cc',
'memory/singleton_unittest.cc',
'memory/weak_ptr_unittest.cc',
'message_loop_proxy_impl_unittest.cc',
'message_loop_unittest.cc',
'message_pump_glib_unittest.cc',
Expand All @@ -117,14 +123,9 @@
'process_util_unittest_mac.h',
'process_util_unittest_mac.mm',
'rand_util_unittest.cc',
'ref_counted_unittest.cc',
'scoped_native_library_unittest.cc',
'scoped_ptr_unittest.cc',
'scoped_temp_dir_unittest.cc',
'sha1_unittest.cc',
'sha2_unittest.cc',
'shared_memory_unittest.cc',
'singleton_unittest.cc',
'stack_container_unittest.cc',
'string16_unittest.cc',
'string_number_conversions_unittest.cc',
Expand Down Expand Up @@ -167,7 +168,6 @@
'values_unittest.cc',
'version_unittest.cc',
'vlog_unittest.cc',
'weak_ptr_unittest.cc',
'win/event_trace_consumer_unittest.cc',
'win/event_trace_controller_unittest.cc',
'win/event_trace_provider_unittest.cc',
Expand Down
40 changes: 21 additions & 19 deletions base/base.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
'lazy_instance.cc',
'lazy_instance.h',
'linked_list.h',
'linked_ptr.h',
'logging.cc',
'logging.h',
'logging_win.cc',
Expand All @@ -124,8 +123,27 @@
'mac/scoped_nsautorelease_pool.mm',
'mach_ipc_mac.h',
'mach_ipc_mac.mm',
'memory_debug.cc',
'memory_debug.h',
'memory/linked_ptr.h',
'memory/memory_debug.cc',
'memory/memory_debug.h',
'memory/raw_scoped_refptr_mismatch_checker.h',
'memory/ref_counted.cc',
'memory/ref_counted.h',
'memory/ref_counted_memory.cc',
'memory/ref_counted_memory.h',
'memory/scoped_callback_factory.h',
'memory/scoped_handle.h',
'memory/scoped_native_library.cc',
'memory/scoped_native_library.h',
'memory/scoped_nsobject.h',
'memory/scoped_open_process.h',
'memory/scoped_ptr.h',
'memory/scoped_temp_dir.cc',
'memory/scoped_temp_dir.h',
'memory/scoped_vector.h',
'memory/singleton.h',
'memory/weak_ptr.cc',
'memory/weak_ptr.h',
'message_loop.cc',
'message_loop.h',
'message_loop_proxy.cc',
Expand Down Expand Up @@ -177,32 +195,18 @@
'rand_util.h',
'rand_util_posix.cc',
'rand_util_win.cc',
'raw_scoped_refptr_mismatch_checker.h',
'ref_counted.cc',
'ref_counted.h',
'ref_counted_memory.cc',
'ref_counted_memory.h',
'resource_util.cc',
'resource_util.h',
'safe_strerror_posix.cc',
'safe_strerror_posix.h',
'scoped_callback_factory.h',
'scoped_handle.h',
'scoped_native_library.cc',
'scoped_native_library.h',
'scoped_nsobject.h',
'scoped_open_process.h',
'scoped_ptr.h',
'scoped_temp_dir.cc',
'scoped_temp_dir.h',
'scoped_vector.h',
'sha1.h',
'sha1_portable.cc',
'sha1_win.cc',
'shared_memory.h',
'shared_memory_posix.cc',
'shared_memory_win.cc',
'singleton.h',
'spin_wait.h',
'stack_container.h',
'stl_util-inl.h',
Expand Down Expand Up @@ -306,8 +310,6 @@
'version.h',
'vlog.cc',
'vlog.h',
'weak_ptr.cc',
'weak_ptr.h',
'win/i18n.cc',
'win/i18n.h',
'win/object_watcher.cc',
Expand Down
4 changes: 2 additions & 2 deletions base/base_paths_linux.cc
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -14,8 +14,8 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/scoped_ptr.h"
#include "base/sys_string_conversions.h"
#include "base/nix/xdg_util.h"

Expand Down
2 changes: 1 addition & 1 deletion base/callback_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma once

#include "base/base_api.h"
#include "base/ref_counted.h"
#include "base/memory/ref_counted.h"

namespace base {
namespace internal {
Expand Down
4 changes: 2 additions & 2 deletions base/callback_old.h
View file
Original file line number Diff line number Diff line change
@@ -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.

#ifndef BASE_CALLBACK_OLD_H_
#define BASE_CALLBACK_OLD_H_
#pragma once

#include "base/memory/raw_scoped_refptr_mismatch_checker.h"
#include "base/tuple.h"
#include "base/raw_scoped_refptr_mismatch_checker.h"

// Callback --------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions base/callback_unittest.cc
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// 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.

#include "base/callback.h"
#include "base/callback_internal.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"

#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion base/command_line.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/singleton.h"
#include "base/memory/singleton.h"
#include "base/string_split.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
Expand Down
4 changes: 2 additions & 2 deletions base/crypto/capi_util.cc
View file
Original file line number Diff line number Diff line change
@@ -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/crypto/capi_util.h"

#include "base/basictypes.h"
#include "base/singleton.h"
#include "base/memory/singleton.h"
#include "base/synchronization/lock.h"

namespace {
Expand Down
4 changes: 2 additions & 2 deletions base/crypto/cssm_init.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 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.

Expand All @@ -8,7 +8,7 @@

#include "base/logging.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/singleton.h"
#include "base/memory/singleton.h"
#include "base/sys_string_conversions.h"

// When writing crypto code for Mac OS X, you may find the following
Expand Down
4 changes: 2 additions & 2 deletions base/crypto/encryptor_unittest.cc
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -7,7 +7,7 @@
#include <string>

#include "base/crypto/symmetric_key.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion base/crypto/mac_security_services_lock.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "base/crypto/mac_security_services_lock.h"

#include "base/singleton.h"
#include "base/memory/singleton.h"
#include "base/synchronization/lock.h"

namespace {
Expand Down
4 changes: 2 additions & 2 deletions base/crypto/rsa_private_key.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 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.

Expand All @@ -8,7 +8,7 @@
#include <list>

#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"

// This file manually encodes and decodes RSA private keys using PrivateKeyInfo
Expand Down
4 changes: 2 additions & 2 deletions base/crypto/rsa_private_key_mac.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 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.

Expand All @@ -8,7 +8,7 @@

#include "base/crypto/cssm_init.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/memory/scoped_ptr.h"

namespace base {

Expand Down
Loading

0 comments on commit 3b63f8f

Please sign in to comment.