From 73a797fb8e6c05e7756d30d7baef447267deacd1 Mon Sep 17 00:00:00 2001
From: "tfarina@chromium.org"
<tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 7 Jun 2010 02:10:18 +0000
Subject: Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base.
TODO: Fix the remaining usages in third_party libraries and get rid of the macro in question.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/2657005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49032 0039d316-1c4b-4281-b951-d872f2087c98
---
net/disk_cache/backend_impl.cc | 4 ++--
net/disk_cache/backend_impl.h | 4 ++--
net/disk_cache/block_files.h | 4 ++--
net/disk_cache/entry_impl.cc | 4 ++--
net/disk_cache/entry_impl.h | 4 ++--
net/disk_cache/mem_backend_impl.h | 4 ++--
net/disk_cache/mem_entry_impl.h | 4 ++--
net/disk_cache/mem_rankings.h | 4 ++--
net/disk_cache/rankings.h | 4 ++--
net/disk_cache/sparse_control.cc | 4 ++--
net/disk_cache/storage_block.h | 4 ++--
net/disk_cache/trace.h | 4 ++--
12 files changed, 24 insertions(+), 24 deletions(-)
(limited to 'net/disk_cache')
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.
--
cgit v1.1