diff options
31 files changed, 62 insertions, 61 deletions
diff --git a/base/basictypes.h b/base/basictypes.h index 64ec1050..8d405b25 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -82,6 +82,10 @@ const int64 kint64max = (( int64) GG_LONGLONG(0x7FFFFFFFFFFFFFFF)); void operator=(const TypeName&) // An older, deprecated, politically incorrect name for the above. +// NOTE: The usage of this macro was baned from our code base, but some +// third_party libraries are yet using it. +// TODO(tfarina): Figure out how to fix the usage of this macro in the +// third_party libraries and get rid of it. #define DISALLOW_EVIL_CONSTRUCTORS(TypeName) DISALLOW_COPY_AND_ASSIGN(TypeName) // A macro to disallow all the implicit constructors, namely the diff --git a/gfx/icon_util_unittest.cc b/gfx/icon_util_unittest.cc index 26ecffd..aba8e5c 100644 --- a/gfx/icon_util_unittest.cc +++ b/gfx/icon_util_unittest.cc @@ -49,7 +49,7 @@ namespace { std::wstring test_data_directory_; private: - DISALLOW_EVIL_CONSTRUCTORS(IconUtilTest); + DISALLOW_COPY_AND_ASSIGN(IconUtilTest); }; }; diff --git a/gpu/command_buffer/common/types.h b/gpu/command_buffer/common/types.h index 35b96d8..beba4fc 100644 --- a/gpu/command_buffer/common/types.h +++ b/gpu/command_buffer/common/types.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -69,9 +69,6 @@ typedef unsigned long long uint64; TypeName(const TypeName&); \ void operator=(const TypeName&) -// An older, deprecated, politically incorrect name for the above. -#define DISALLOW_EVIL_CONSTRUCTORS(TypeName) DISALLOW_COPY_AND_ASSIGN(TypeName) - // A macro to disallow all the implicit constructors, namely the // default constructor, copy constructor and operator= functions. // diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h index e66dd92..22e69c5 100644 --- a/ipc/ipc_sync_channel.h +++ b/ipc/ipc_sync_channel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -146,7 +146,7 @@ class SyncChannel : public ChannelProxy, // Used to signal events between the IPC and listener threads. base::WaitableEventWatcher dispatch_watcher_; - DISALLOW_EVIL_CONSTRUCTORS(SyncChannel); + DISALLOW_COPY_AND_ASSIGN(SyncChannel); }; } // namespace IPC diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index 13e9a1f..2566f9b 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. // @@ -222,7 +222,7 @@ class Worker : public Channel::Listener, public Message::Sender { base::WaitableEvent shutdown_event_; - DISALLOW_EVIL_CONSTRUCTORS(Worker); + DISALLOW_COPY_AND_ASSIGN(Worker); }; diff --git a/net/base/gzip_filter.h b/net/base/gzip_filter.h index d22b9e4..eb88b7f 100644 --- a/net/base/gzip_filter.h +++ b/net/base/gzip_filter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -136,7 +136,7 @@ class GZipFilter : public Filter { // we don't get a valid gzip header. bool possible_sdch_pass_through_; - DISALLOW_EVIL_CONSTRUCTORS(GZipFilter); + DISALLOW_COPY_AND_ASSIGN(GZipFilter); }; #endif // NET_BASE_GZIP_FILTER_H__ diff --git a/net/base/ssl_config_service_mac.h b/net/base/ssl_config_service_mac.h index 5a60803..6d639ca 100644 --- a/net/base/ssl_config_service_mac.h +++ b/net/base/ssl_config_service_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -48,7 +48,7 @@ class SSLConfigServiceMac : public SSLConfigService { base::TimeTicks config_time_; bool ever_updated_; - DISALLOW_EVIL_CONSTRUCTORS(SSLConfigServiceMac); + DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceMac); }; } // namespace net diff --git a/net/base/ssl_config_service_win.h b/net/base/ssl_config_service_win.h index e7b77c7..928ca1a 100644 --- a/net/base/ssl_config_service_win.h +++ b/net/base/ssl_config_service_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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,7 +53,7 @@ class SSLConfigServiceWin : public SSLConfigService { base::TimeTicks config_time_; bool ever_updated_; - DISALLOW_EVIL_CONSTRUCTORS(SSLConfigServiceWin); + DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceWin); }; } // namespace net diff --git a/net/base/telnet_server.h b/net/base/telnet_server.h index d8d21e8..8160141 100644 --- a/net/base/telnet_server.h +++ b/net/base/telnet_server.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -55,7 +55,7 @@ private: int iac_option_; // Last option read. std::string command_line_; - DISALLOW_EVIL_CONSTRUCTORS(TelnetServer); + DISALLOW_COPY_AND_ASSIGN(TelnetServer); }; #endif // NET_BASE_TELNET_SERVER_H_ diff --git a/net/base/upload_data_stream.h b/net/base/upload_data_stream.h index 9fac07e..5e28721 100644 --- a/net/base/upload_data_stream.h +++ b/net/base/upload_data_stream.h @@ -83,7 +83,7 @@ class UploadDataStream { // Whether there is no data left to read. bool eof_; - DISALLOW_EVIL_CONSTRUCTORS(UploadDataStream); + DISALLOW_COPY_AND_ASSIGN(UploadDataStream); }; } // namespace net diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index 84e956f..edd5c59 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -84,7 +84,7 @@ class CleanupTask : public Task { private: FilePath path_; std::string name_; - DISALLOW_EVIL_CONSTRUCTORS(CleanupTask); + DISALLOW_COPY_AND_ASSIGN(CleanupTask); }; void CleanupTask::Run() { diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h index 6267fac..58d81eb 100644 --- a/net/disk_cache/backend_impl.h +++ b/net/disk_cache/backend_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -303,7 +303,7 @@ class BackendImpl : public Backend { scoped_refptr<TraceObject> trace_object_; // Inits internal tracing. ScopedRunnableMethodFactory<BackendImpl> factory_; - DISALLOW_EVIL_CONSTRUCTORS(BackendImpl); + DISALLOW_COPY_AND_ASSIGN(BackendImpl); }; // Returns the prefered max cache size given the available disk space. diff --git a/net/disk_cache/block_files.h b/net/disk_cache/block_files.h index 8503062..5a3e9af 100644 --- a/net/disk_cache/block_files.h +++ b/net/disk_cache/block_files.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -80,7 +80,7 @@ class BlockFiles { FRIEND_TEST(DiskCacheTest, BlockFiles_ZeroSizeFile); FRIEND_TEST(DiskCacheTest, BlockFiles_InvalidFile); - DISALLOW_EVIL_CONSTRUCTORS(BlockFiles); + DISALLOW_COPY_AND_ASSIGN(BlockFiles); }; } // namespace disk_cache diff --git a/net/disk_cache/entry_impl.cc b/net/disk_cache/entry_impl.cc index a1e0b32..e643910 100644 --- a/net/disk_cache/entry_impl.cc +++ b/net/disk_cache/entry_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -45,7 +45,7 @@ class SyncCallback: public disk_cache::FileIOCallback { scoped_refptr<net::IOBuffer> buf_; TimeTicks start_; - DISALLOW_EVIL_CONSTRUCTORS(SyncCallback); + DISALLOW_COPY_AND_ASSIGN(SyncCallback); }; void SyncCallback::OnFileIOComplete(int bytes_copied) { diff --git a/net/disk_cache/entry_impl.h b/net/disk_cache/entry_impl.h index 1cc0b84..294f52fc 100644 --- a/net/disk_cache/entry_impl.h +++ b/net/disk_cache/entry_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -189,7 +189,7 @@ class EntryImpl : public Entry, public base::RefCounted<EntryImpl> { bool doomed_; // True if this entry was removed from the cache. scoped_ptr<SparseControl> sparse_; // Support for sparse entries. - DISALLOW_EVIL_CONSTRUCTORS(EntryImpl); + DISALLOW_COPY_AND_ASSIGN(EntryImpl); }; } // namespace disk_cache diff --git a/net/disk_cache/mem_backend_impl.h b/net/disk_cache/mem_backend_impl.h index 48d196c..e687410 100644 --- a/net/disk_cache/mem_backend_impl.h +++ b/net/disk_cache/mem_backend_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -94,7 +94,7 @@ class MemBackendImpl : public Backend { int32 max_size_; // Maximum data size for this instance. int32 current_size_; - DISALLOW_EVIL_CONSTRUCTORS(MemBackendImpl); + DISALLOW_COPY_AND_ASSIGN(MemBackendImpl); }; } // namespace disk_cache diff --git a/net/disk_cache/mem_entry_impl.h b/net/disk_cache/mem_entry_impl.h index 4ff7a0f..cd793a4 100644 --- a/net/disk_cache/mem_entry_impl.h +++ b/net/disk_cache/mem_entry_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -159,7 +159,7 @@ class MemEntryImpl : public Entry { MemBackendImpl* backend_; // Back pointer to the cache. bool doomed_; // True if this entry was removed from the cache. - DISALLOW_EVIL_CONSTRUCTORS(MemEntryImpl); + DISALLOW_COPY_AND_ASSIGN(MemEntryImpl); }; } // namespace disk_cache diff --git a/net/disk_cache/mem_rankings.h b/net/disk_cache/mem_rankings.h index 680be4c..fa90688 100644 --- a/net/disk_cache/mem_rankings.h +++ b/net/disk_cache/mem_rankings.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -36,7 +36,7 @@ class MemRankings { MemEntryImpl* head_; MemEntryImpl* tail_; - DISALLOW_EVIL_CONSTRUCTORS(MemRankings); + DISALLOW_COPY_AND_ASSIGN(MemRankings); }; } // namespace disk_cache diff --git a/net/disk_cache/rankings.h b/net/disk_cache/rankings.h index c9fc8d2..f635355 100644 --- a/net/disk_cache/rankings.h +++ b/net/disk_cache/rankings.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -86,7 +86,7 @@ class Rankings { private: Rankings* rankings_; - DISALLOW_EVIL_CONSTRUCTORS(ScopedRankingsBlock); + DISALLOW_COPY_AND_ASSIGN(ScopedRankingsBlock); }; // If we have multiple lists, we have to iterate through all at the same time. diff --git a/net/disk_cache/sparse_control.cc b/net/disk_cache/sparse_control.cc index 9f0f537..612d06c 100644 --- a/net/disk_cache/sparse_control.cc +++ b/net/disk_cache/sparse_control.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -71,7 +71,7 @@ class ChildrenDeleter disk_cache::Bitmap children_map_; int64 signature_; scoped_array<char> buffer_; - DISALLOW_EVIL_CONSTRUCTORS(ChildrenDeleter); + DISALLOW_COPY_AND_ASSIGN(ChildrenDeleter); }; // This is the callback of the file operation. diff --git a/net/disk_cache/storage_block.h b/net/disk_cache/storage_block.h index 0d94b82..e77c5bb 100644 --- a/net/disk_cache/storage_block.h +++ b/net/disk_cache/storage_block.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -82,7 +82,7 @@ class StorageBlock : public FileBlock { bool own_data_; // Is data_ owned by this object or shared with someone else. bool extended_; // Used to store an entry of more than one block. - DISALLOW_EVIL_CONSTRUCTORS(StorageBlock); + DISALLOW_COPY_AND_ASSIGN(StorageBlock); }; typedef StorageBlock<EntryStore> CacheEntryBlock; diff --git a/net/disk_cache/trace.h b/net/disk_cache/trace.h index be50417..a431890 100644 --- a/net/disk_cache/trace.h +++ b/net/disk_cache/trace.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -36,7 +36,7 @@ class TraceObject : public base::RefCounted<TraceObject> { ~TraceObject() { DestroyTrace(); } - DISALLOW_EVIL_CONSTRUCTORS(TraceObject); + DISALLOW_COPY_AND_ASSIGN(TraceObject); }; // Traces to the internal buffer. diff --git a/net/tools/fetch/http_listen_socket.h b/net/tools/fetch/http_listen_socket.h index 73f09f6..15df455 100644 --- a/net/tools/fetch/http_listen_socket.h +++ b/net/tools/fetch/http_listen_socket.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -54,7 +54,7 @@ class HttpListenSocket : public ListenSocket, HttpListenSocket::Delegate* delegate_; std::string recv_data_; - DISALLOW_EVIL_CONSTRUCTORS(HttpListenSocket); + DISALLOW_COPY_AND_ASSIGN(HttpListenSocket); }; #endif // NET_BASE_TOOLS_HTTP_LISTEN_SOCKET_H_ diff --git a/net/tools/fetch/http_server.h b/net/tools/fetch/http_server.h index 67d1ef5..1a3d402 100644 --- a/net/tools/fetch/http_server.h +++ b/net/tools/fetch/http_server.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -18,7 +18,7 @@ public: private: scoped_ptr<HttpSession> session_; - DISALLOW_EVIL_CONSTRUCTORS(HttpServer); + DISALLOW_COPY_AND_ASSIGN(HttpServer); }; #endif // NET_BASE_TOOLS_HTTP_SERVER_H_ diff --git a/net/tools/fetch/http_session.h b/net/tools/fetch/http_session.h index 4d9e84b..a1d57bf 100644 --- a/net/tools/fetch/http_session.h +++ b/net/tools/fetch/http_session.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -20,7 +20,7 @@ class HttpSession : HttpListenSocket::Delegate { private: scoped_refptr<HttpListenSocket> socket_; - DISALLOW_EVIL_CONSTRUCTORS(HttpSession); + DISALLOW_COPY_AND_ASSIGN(HttpSession); }; #endif // NET_BASE_TOOLS_HTTP_SESSION_H_ diff --git a/net/url_request/https_prober.h b/net/url_request/https_prober.h index 327fc16..2ab1f86 100644 --- a/net/url_request/https_prober.h +++ b/net/url_request/https_prober.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -66,7 +66,7 @@ class HTTPSProber : public URLRequest::Delegate { std::set<std::string> probed_; friend struct DefaultSingletonTraits<HTTPSProber>; - DISALLOW_EVIL_CONSTRUCTORS(HTTPSProber); + DISALLOW_COPY_AND_ASSIGN(HTTPSProber); }; } // namespace net diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h index 24a6c72..e0c0fec 100644 --- a/net/url_request/url_request_file_dir_job.h +++ b/net/url_request/url_request_file_dir_job.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -63,7 +63,7 @@ class URLRequestFileDirJob scoped_refptr<net::IOBuffer> read_buffer_; int read_buffer_length_; - DISALLOW_EVIL_CONSTRUCTORS(URLRequestFileDirJob); + DISALLOW_COPY_AND_ASSIGN(URLRequestFileDirJob); }; #endif // NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H__ diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h index 3f255b8..d81e68c 100644 --- a/net/url_request/url_request_filter.h +++ b/net/url_request/url_request_filter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. // @@ -79,7 +79,7 @@ class URLRequestFilter { // Singleton instance. static URLRequestFilter* shared_instance_; - DISALLOW_EVIL_CONSTRUCTORS(URLRequestFilter); + DISALLOW_COPY_AND_ASSIGN(URLRequestFilter); }; #endif // NET_URL_REQUEST_URL_REQUEST_FILTER_H_ diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h index 9930e17..d8934e6 100644 --- a/net/url_request/url_request_job_manager.h +++ b/net/url_request/url_request_job_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -97,7 +97,7 @@ class URLRequestJobManager { } #endif - DISALLOW_EVIL_CONSTRUCTORS(URLRequestJobManager); + DISALLOW_COPY_AND_ASSIGN(URLRequestJobManager); }; #endif // NET_URL_REQUEST_URL_REQUEST_JOB_MANAGER_H__ diff --git a/third_party/libjingle/overrides/talk/base/logging.h b/third_party/libjingle/overrides/talk/base/logging.h index 4b051b3..2d058e6 100644 --- a/third_party/libjingle/overrides/talk/base/logging.h +++ b/third_party/libjingle/overrides/talk/base/logging.h @@ -235,7 +235,7 @@ class LogMessage { // are we in diagnostic mode (as defined by the app)? static bool is_diagnostic_mode_; - DISALLOW_EVIL_CONSTRUCTORS(LogMessage); + DISALLOW_COPY_AND_ASSIGN(LogMessage); }; ////////////////////////////////////////////////////////////////////// diff --git a/tools/memory_watcher/call_stack.h b/tools/memory_watcher/call_stack.h index aa3685d..264ad901 100644 --- a/tools/memory_watcher/call_stack.h +++ b/tools/memory_watcher/call_stack.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. // @@ -138,7 +138,7 @@ class CallStack { PrivateHookAllocator<int32> > SymbolCache; static SymbolCache* symbol_cache_; - DISALLOW_EVIL_CONSTRUCTORS(CallStack); + DISALLOW_COPY_AND_ASSIGN(CallStack); }; // An AllocationStack is a type of CallStack which represents a CallStack where @@ -162,7 +162,7 @@ class AllocationStack : public CallStack { static AllocationStack* freelist_; static Lock freelist_lock_; - DISALLOW_EVIL_CONSTRUCTORS(AllocationStack); + DISALLOW_COPY_AND_ASSIGN(AllocationStack); }; #endif // MEMORY_WATCHER_CALL_STACK_H_ |