Use DISALLOW_COPY_AND_ASSIGN instead of DISALLOW_EVIL_CONSTRUCTORS in chrome directory.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/2657003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49024 0039d316-1c4b-4281-b951-d872f2087c98

85 files changed, 161 insertions, 161 deletions

diff --git a/chrome/browser/autocomplete/history_contents_provider.h b/chrome/browser/autocomplete/history_contents_provider.h
index 18a4b36..c2148cc 100644
--- a/chrome/browser/autocomplete/history_contents_provider.h
+++ b/chrome/browser/autocomplete/history_contents_provider.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.
 
@@ -104,7 +104,7 @@ class HistoryContentsProvider : public AutocompleteProvider {
   // Current query string.
   std::wstring query_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(HistoryContentsProvider);
+  DISALLOW_COPY_AND_ASSIGN(HistoryContentsProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H_
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
index 152a938..da4fc61 100644
--- a/chrome/browser/autocomplete/history_url_provider.h
+++ b/chrome/browser/autocomplete/history_url_provider.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.
 
@@ -118,7 +118,7 @@ struct HistoryURLProviderParams {
   std::wstring languages;
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(HistoryURLProviderParams);
+  DISALLOW_COPY_AND_ASSIGN(HistoryURLProviderParams);
 };
 
 // This class is an autocomplete provider and is also a pseudo-internal
diff --git a/chrome/browser/autocomplete/keyword_provider.h b/chrome/browser/autocomplete/keyword_provider.h
index 6fb744b..3ef770d 100644
--- a/chrome/browser/autocomplete/keyword_provider.h
+++ b/chrome/browser/autocomplete/keyword_provider.h
@@ -139,7 +139,7 @@ class KeywordProvider :
 
   NotificationRegistrar registrar_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(KeywordProvider);
+  DISALLOW_COPY_AND_ASSIGN(KeywordProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index 9c60334..9ec2c3a 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.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.
 //
@@ -321,7 +321,7 @@ class SearchProvider : public AutocompleteProvider,
   // Whether suggest_results_ is valid.
   bool have_suggest_results_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SearchProvider);
+  DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
diff --git a/chrome/browser/automation/automation_resource_tracker.h b/chrome/browser/automation/automation_resource_tracker.h
index 9f6df8b..58703e7 100644
--- a/chrome/browser/automation/automation_resource_tracker.h
+++ b/chrome/browser/automation/automation_resource_tracker.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.
 
@@ -58,7 +58,7 @@ class AutomationResourceTrackerImpl {
   HandleToResourceMap handle_to_resource_;
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(AutomationResourceTrackerImpl);
+  DISALLOW_COPY_AND_ASSIGN(AutomationResourceTrackerImpl);
 
   IPC::Message::Sender* sender_;
 };
diff --git a/chrome/browser/browsing_instance.h b/chrome/browser/browsing_instance.h
index fe0ea69..e44f747 100644
--- a/chrome/browser/browsing_instance.h
+++ b/chrome/browser/browsing_instance.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.
 
@@ -130,7 +130,7 @@ class BrowsingInstance : public base::RefCounted<BrowsingInstance> {
   // Global map of Profile to SiteInstanceMap, for process-per-site.
   static ProfileSiteInstanceMap profile_site_instance_map_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(BrowsingInstance);
+  DISALLOW_COPY_AND_ASSIGN(BrowsingInstance);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_INSTANCE_H_
diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h
index 32a2120..f3251f0 100644
--- a/chrome/browser/cancelable_request.h
+++ b/chrome/browser/cancelable_request.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.
 
@@ -153,7 +153,7 @@ class CancelableRequestProvider {
   // The next handle value we will return. Protected by the |lock_|.
   int next_handle_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CancelableRequestProvider);
+  DISALLOW_COPY_AND_ASSIGN(CancelableRequestProvider);
 };
 
 // CancelableRequestConsumer --------------------------------------------------
@@ -436,7 +436,7 @@ class CancelableRequestBase
   base::CancellationFlag canceled_;
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(CancelableRequestBase);
+  DISALLOW_COPY_AND_ASSIGN(CancelableRequestBase);
 };
 
 // Templatized class. This is the one you should use directly or inherit from.
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index 30e1fa4..4d45f93 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.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.
 
@@ -364,7 +364,7 @@ class ModelessHtmlDialogDelegate : public HtmlDialogUIDelegate {
   // active browser window.
   gfx::NativeWindow parent_wnd_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ModelessHtmlDialogDelegate);
+  DISALLOW_COPY_AND_ASSIGN(ModelessHtmlDialogDelegate);
 };
 
 // Allows InvokeLater without adding refcounting.  The object is only deleted
diff --git a/chrome/browser/chromeos/external_cookie_handler_unittest.cc b/chrome/browser/chromeos/external_cookie_handler_unittest.cc
index ad75af9..c1ac783 100644
--- a/chrome/browser/chromeos/external_cookie_handler_unittest.cc
+++ b/chrome/browser/chromeos/external_cookie_handler_unittest.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.
 
@@ -61,7 +61,7 @@ class MockCookieStore : public net::CookieStore {
   std::set<std::string> cookies_;
   const GURL expected_url_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(MockCookieStore);
+  DISALLOW_COPY_AND_ASSIGN(MockCookieStore);
 };
 
 TEST_F(ExternalCookieHandlerTest, MockCookieStoreSanityTest) {
diff --git a/chrome/browser/chromeos/frame/normal_browser_frame_view.h b/chrome/browser/chromeos/frame/normal_browser_frame_view.h
index d36dd29..5de45dc 100644
--- a/chrome/browser/chromeos/frame/normal_browser_frame_view.h
+++ b/chrome/browser/chromeos/frame/normal_browser_frame_view.h
@@ -84,7 +84,7 @@ class NormalBrowserFrameView : public BrowserNonClientFrameView,
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(NormalBrowserFrameView);
+  DISALLOW_COPY_AND_ASSIGN(NormalBrowserFrameView);
 };
 
 }  // namespace chromeos
diff --git a/chrome/browser/command_updater.h b/chrome/browser/command_updater.h
index 1ef1ee6..e6e9557 100644
--- a/chrome/browser/command_updater.h
+++ b/chrome/browser/command_updater.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.
 
@@ -91,7 +91,7 @@ class CommandUpdater {
   CommandMap commands_;
 
   CommandUpdater();
-  DISALLOW_EVIL_CONSTRUCTORS(CommandUpdater);
+  DISALLOW_COPY_AND_ASSIGN(CommandUpdater);
 };
 
 #endif  // CHROME_BROWSER_COMMAND_UPDATER_H_
diff --git a/chrome/browser/cross_site_request_manager.h b/chrome/browser/cross_site_request_manager.h
index 0c93f4a..966595c 100644
--- a/chrome/browser/cross_site_request_manager.h
+++ b/chrome/browser/cross_site_request_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.
 
@@ -50,7 +50,7 @@ class CrossSiteRequestManager {
   // information about the RenderViewHosts between the UI and IO threads.
   RenderViewSet pending_cross_site_views_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CrossSiteRequestManager);
+  DISALLOW_COPY_AND_ASSIGN(CrossSiteRequestManager);
 };
 
 #endif  // CHROME_BROWSER_CROSS_SITE_REQUEST_MANAGER_H__
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 920d937..a011801 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -77,7 +77,7 @@ class URLRequestChromeJob : public URLRequestJob {
   int pending_buf_size_;
   std::string mime_type_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(URLRequestChromeJob);
+  DISALLOW_COPY_AND_ASSIGN(URLRequestChromeJob);
 };
 
 // URLRequestChromeFileJob is a URLRequestJob that acts like a file:// URL
@@ -88,7 +88,7 @@ class URLRequestChromeFileJob : public URLRequestFileJob {
  private:
   virtual ~URLRequestChromeFileJob();
 
-  DISALLOW_EVIL_CONSTRUCTORS(URLRequestChromeFileJob);
+  DISALLOW_COPY_AND_ASSIGN(URLRequestChromeFileJob);
 };
 
 void RegisterURLRequestChromeJob() {
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index dd0cb46..8429be2 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.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.
 
@@ -55,7 +55,7 @@ class DownloadManagerTest : public testing::Test {
   scoped_refptr<DownloadManager> download_manager_;
   MessageLoopForUI message_loop_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(DownloadManagerTest);
+  DISALLOW_COPY_AND_ASSIGN(DownloadManagerTest);
 };
 
 namespace {
diff --git a/chrome/browser/download/save_file.h b/chrome/browser/download/save_file.h
index 5fdd634..1a25ef4 100644
--- a/chrome/browser/download/save_file.h
+++ b/chrome/browser/download/save_file.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.
 
@@ -72,7 +72,7 @@ class SaveFile {
   // Whether the saved file is still receiving data.
   bool in_progress_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SaveFile);
+  DISALLOW_COPY_AND_ASSIGN(SaveFile);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_SAVE_FILE_H__
diff --git a/chrome/browser/download/save_item.h b/chrome/browser/download/save_item.h
index 7857b97..8984dab 100644
--- a/chrome/browser/download/save_item.h
+++ b/chrome/browser/download/save_item.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.
 //
@@ -105,7 +105,7 @@ class SaveItem {
   // Our owning object.
   SavePackage* package_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SaveItem);
+  DISALLOW_COPY_AND_ASSIGN(SaveItem);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
diff --git a/chrome/browser/fav_icon_helper.h b/chrome/browser/fav_icon_helper.h
index 008ba7e..d1922f5 100644
--- a/chrome/browser/fav_icon_helper.h
+++ b/chrome/browser/fav_icon_helper.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.
 
@@ -183,7 +183,7 @@ class FavIconHelper : public RenderViewHostDelegate::FavIcon {
   typedef std::map<int, DownloadRequest> DownloadRequests;
   DownloadRequests download_requests_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(FavIconHelper);
+  DISALLOW_COPY_AND_ASSIGN(FavIconHelper);
 };
 
 #endif  // CHROME_BROWSER_FAV_ICON_HELPER_H__
diff --git a/chrome/browser/geolocation/device_data_provider.h b/chrome/browser/geolocation/device_data_provider.h
index 2ed54ea..f13c770 100644
--- a/chrome/browser/geolocation/device_data_provider.h
+++ b/chrome/browser/geolocation/device_data_provider.h
@@ -395,7 +395,7 @@ class DeviceDataProvider : public NonThreadSafe {
   // The internal implementation.
   scoped_refptr<DeviceDataProviderImplBase<DataType> > impl_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(DeviceDataProvider);
+  DISALLOW_COPY_AND_ASSIGN(DeviceDataProvider);
 };
 
 // static
diff --git a/chrome/browser/geolocation/network_location_request.h b/chrome/browser/geolocation/network_location_request.h
index 6e38a28..071313c 100644
--- a/chrome/browser/geolocation/network_location_request.h
+++ b/chrome/browser/geolocation/network_location_request.h
@@ -76,7 +76,7 @@ class NetworkLocationRequest : private URLFetcher::Delegate {
   WifiData wifi_data_;
   base::Time timestamp_;  // Timestamp of the above data, not of the request.
 
-  DISALLOW_EVIL_CONSTRUCTORS(NetworkLocationRequest);
+  DISALLOW_COPY_AND_ASSIGN(NetworkLocationRequest);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
diff --git a/chrome/browser/google_update.h b/chrome/browser/google_update.h
index b430a08..9bbe58f 100644
--- a/chrome/browser/google_update.h
+++ b/chrome/browser/google_update.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.
 
@@ -137,7 +137,7 @@ class GoogleUpdate : public base::RefCountedThreadSafe<GoogleUpdate> {
   // The listener who is interested in finding out the result of the operation.
   GoogleUpdateStatusListener* listener_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(GoogleUpdate);
+  DISALLOW_COPY_AND_ASSIGN(GoogleUpdate);
 };
 
 #endif  // CHROME_BROWSER_GOOGLE_UPDATE_H_
diff --git a/chrome/browser/hang_monitor/hung_window_detector.h b/chrome/browser/hang_monitor/hung_window_detector.h
index d4e2553..bcf1617 100644
--- a/chrome/browser/hang_monitor/hung_window_detector.h
+++ b/chrome/browser/hang_monitor/hung_window_detector.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.
 
@@ -84,7 +84,7 @@ class HungWindowDetector : public WorkerThreadTicker::Callback {
   // Indicates if this object is currently enumerating hung windows
   bool enumerating_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(HungWindowDetector);
+  DISALLOW_COPY_AND_ASSIGN(HungWindowDetector);
 };
 
 
diff --git a/chrome/browser/history/expire_history_backend.h b/chrome/browser/history/expire_history_backend.h
index 22484c4..0435561 100644
--- a/chrome/browser/history/expire_history_backend.h
+++ b/chrome/browser/history/expire_history_backend.h
@@ -276,7 +276,7 @@ class ExpireHistoryBackend {
   // loaded.
   BookmarkService* bookmark_service_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ExpireHistoryBackend);
+  DISALLOW_COPY_AND_ASSIGN(ExpireHistoryBackend);
 };
 
 }  // namespace history
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index a1987b5..aa775ae 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -46,7 +46,7 @@ class HistoryBackendTestDelegate : public HistoryBackend::Delegate {
   // Not owned by us.
   HistoryBackendTest* test_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(HistoryBackendTestDelegate);
+  DISALLOW_COPY_AND_ASSIGN(HistoryBackendTestDelegate);
 };
 
 class HistoryBackendTest : public testing::Test {
diff --git a/chrome/browser/history/history_marshaling.h b/chrome/browser/history/history_marshaling.h
index 154ec23..39b8983 100644
--- a/chrome/browser/history/history_marshaling.h
+++ b/chrome/browser/history/history_marshaling.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.
 
@@ -56,7 +56,7 @@ class HistoryAddPageArgs
 
   ~HistoryAddPageArgs() {}
 
-  DISALLOW_EVIL_CONSTRUCTORS(HistoryAddPageArgs);
+  DISALLOW_COPY_AND_ASSIGN(HistoryAddPageArgs);
 };
 
 // Querying -------------------------------------------------------------------
diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc
index 2f1d074..d934a78 100644
--- a/chrome/browser/history/history_querying_unittest.cc
+++ b/chrome/browser/history/history_querying_unittest.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.
 
@@ -141,7 +141,7 @@ class HistoryQueryTest : public testing::Test {
   // can return them.
   QueryResults last_query_results_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(HistoryQueryTest);
+  DISALLOW_COPY_AND_ASSIGN(HistoryQueryTest);
 };
 
 TEST_F(HistoryQueryTest, Basic) {
diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h
index 9161ba1..1d45f6c 100644
--- a/chrome/browser/history/history_types.h
+++ b/chrome/browser/history/history_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.
 
@@ -462,7 +462,7 @@ class QueryResults {
   // Maps URLs to entries in results_.
   URLToResultIndices url_to_results_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(QueryResults);
+  DISALLOW_COPY_AND_ASSIGN(QueryResults);
 };
 
 // QueryOptions ----------------------------------------------------------------
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index e0c74a9..1886cdc 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.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.
 
@@ -920,7 +920,7 @@ class HistoryDBTaskImpl : public HistoryDBTask {
  private:
   virtual ~HistoryDBTaskImpl() {}
 
-  DISALLOW_EVIL_CONSTRUCTORS(HistoryDBTaskImpl);
+  DISALLOW_COPY_AND_ASSIGN(HistoryDBTaskImpl);
 };
 
 // static
diff --git a/chrome/browser/history/visit_tracker.h b/chrome/browser/history/visit_tracker.h
index 3d07a39..43de7a0 100644
--- a/chrome/browser/history/visit_tracker.h
+++ b/chrome/browser/history/visit_tracker.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.
 
@@ -58,7 +58,7 @@ class VisitTracker {
   // Maps render view hosts to lists of recent transitions.
   HostList hosts_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(VisitTracker);
+  DISALLOW_COPY_AND_ASSIGN(VisitTracker);
 };
 
 }  // namespace history
diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h
index 447027d..c320e38 100644
--- a/chrome/browser/importer/firefox2_importer.h
+++ b/chrome/browser/importer/firefox2_importer.h
@@ -124,7 +124,7 @@ class Firefox2Importer : public Importer {
   // If true, we only parse the bookmarks.html file specified as source_path_.
   bool parsing_bookmarks_html_file_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Firefox2Importer);
+  DISALLOW_COPY_AND_ASSIGN(Firefox2Importer);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_FIREFOX2_IMPORTER_H_
diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc
index 9959502..40693ef 100644
--- a/chrome/browser/importer/firefox_importer_utils.cc
+++ b/chrome/browser/importer/firefox_importer_utils.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.
 
@@ -39,7 +39,7 @@ class FirefoxURLParameterFilter : public TemplateURLParser::ParameterFilter {
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(FirefoxURLParameterFilter);
+  DISALLOW_COPY_AND_ASSIGN(FirefoxURLParameterFilter);
 };
 }  // namespace
 
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc
index e8256f6..97816ad 100644
--- a/chrome/browser/jankometer.cc
+++ b/chrome/browser/jankometer.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.
 
@@ -212,7 +212,7 @@ class JankObserver : public base::RefCountedThreadSafe<JankObserver>,
   scoped_refptr<Histogram> total_times_;  // Total queueing plus processing.
   JankWatchdog total_time_watchdog_;  // Watching for excessive total_time.
 
-  DISALLOW_EVIL_CONSTRUCTORS(JankObserver);
+  DISALLOW_COPY_AND_ASSIGN(JankObserver);
 };
 
 // These objects are created by InstallJankometer and leaked.
diff --git a/chrome/browser/load_from_memory_cache_details.h b/chrome/browser/load_from_memory_cache_details.h
index 0e8e793b..5727c64 100644
--- a/chrome/browser/load_from_memory_cache_details.h
+++ b/chrome/browser/load_from_memory_cache_details.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.
 
@@ -42,7 +42,7 @@ class LoadFromMemoryCacheDetails {
   int cert_id_;
   int cert_status_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(LoadFromMemoryCacheDetails);
+  DISALLOW_COPY_AND_ASSIGN(LoadFromMemoryCacheDetails);
 };
 
 #endif  // CHROME_BROWSER_LOAD_FROM_MEMORY_CACHE_DETAILS_H__
diff --git a/chrome/browser/memory_details.h b/chrome/browser/memory_details.h
index 21af097..16354d5 100644
--- a/chrome/browser/memory_details.h
+++ b/chrome/browser/memory_details.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.
 
@@ -141,7 +141,7 @@ class MemoryDetails : public base::RefCountedThreadSafe<MemoryDetails> {
 
   std::vector<ProcessData> process_data_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(MemoryDetails);
+  DISALLOW_COPY_AND_ASSIGN(MemoryDetails);
 };
 
 #endif  // CHROME_BROWSER_MEMORY_DETAILS_H_
diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index 34fa225..18e3b32 100644
--- a/chrome/browser/metrics/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
@@ -217,7 +217,7 @@ class MetricsLog {
   xmlTextWriterPtr writer_;
   int num_events_;  // the number of events recorded in this log
 
-  DISALLOW_EVIL_CONSTRUCTORS(MetricsLog);
+  DISALLOW_COPY_AND_ASSIGN(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_
diff --git a/chrome/browser/metrics/metrics_response.h b/chrome/browser/metrics/metrics_response.h
index e7433af..9cd7653 100644
--- a/chrome/browser/metrics/metrics_response.h
+++ b/chrome/browser/metrics/metrics_response.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.
 
@@ -51,7 +51,7 @@ class MetricsResponse {
   int events_;
   int interval_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(MetricsResponse);
+  DISALLOW_COPY_AND_ASSIGN(MetricsResponse);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_RESPONSE_H_
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index a1362cb3..90e4ce5 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.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.
 
@@ -279,7 +279,7 @@ class MetricsMemoryDetails : public MemoryDetails {
   ~MetricsMemoryDetails() {}
 
   Task* completion_;
-  DISALLOW_EVIL_CONSTRUCTORS(MetricsMemoryDetails);
+  DISALLOW_COPY_AND_ASSIGN(MetricsMemoryDetails);
 };
 
 class MetricsService::GetPluginListTaskComplete : public Task {
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index 796cc0e..b972d5e 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_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.
 
@@ -64,7 +64,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
   typedef std::map<GURL, MockInfo> URLMockInfoMap;
   static URLMockInfoMap url_mock_info_map_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(URLRequestMockNetErrorJob);
+  DISALLOW_COPY_AND_ASSIGN(URLRequestMockNetErrorJob);
 };
 
 #endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
diff --git a/chrome/browser/options_page_base.h b/chrome/browser/options_page_base.h
index 013a26c..513b13a 100644
--- a/chrome/browser/options_page_base.h
+++ b/chrome/browser/options_page_base.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.
 
@@ -55,7 +55,7 @@ class OptionsPageBase : public NotificationObserver {
   // The Profile associated with this page.
   Profile* profile_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(OptionsPageBase);
+  DISALLOW_COPY_AND_ASSIGN(OptionsPageBase);
 };
 
 #endif  // CHROME_BROWSER_OPTIONS_PAGE_BASE_H_
diff --git a/chrome/browser/page_state.h b/chrome/browser/page_state.h
index a85ac4c..de91ed2 100644
--- a/chrome/browser/page_state.h
+++ b/chrome/browser/page_state.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 @@ class PageState {
   // our actual state collection
   scoped_ptr<DictionaryValue> state_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PageState);
+  DISALLOW_COPY_AND_ASSIGN(PageState);
 };
 
 
diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h
index 6db93ce..4642328 100644
--- a/chrome/browser/password_manager/password_form_manager.h
+++ b/chrome/browser/password_manager/password_form_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.
 
@@ -168,6 +168,6 @@ class PasswordFormManager : public PasswordStoreConsumer {
   // The profile from which we get the WebDataService.
   Profile* profile_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PasswordFormManager);
+  DISALLOW_COPY_AND_ASSIGN(PasswordFormManager);
 };
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h
index cc9c99a..79bd332 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_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.
 
@@ -130,7 +130,7 @@ class PasswordManager : public LoginModel {
   // passwords or ask you if you want to save passwords).
   BooleanPrefMember password_manager_enabled_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PasswordManager);
+  DISALLOW_COPY_AND_ASSIGN(PasswordManager);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
diff --git a/chrome/browser/possible_url_model.h b/chrome/browser/possible_url_model.h
index 8f37f65..a6fa1ab 100644
--- a/chrome/browser/possible_url_model.h
+++ b/chrome/browser/possible_url_model.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.
 
@@ -87,7 +87,7 @@ class PossibleURLModel : public TableModel {
   typedef std::map<size_t, SkBitmap> FavIconMap;
   FavIconMap fav_icon_map_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PossibleURLModel);
+  DISALLOW_COPY_AND_ASSIGN(PossibleURLModel);
 };
 
 #endif  // CHROME_BROWSER_POSSIBLE_URL_MODEL_H_
diff --git a/chrome/browser/profile_manager.h b/chrome/browser/profile_manager.h
index 41c2589..0542f7d 100644
--- a/chrome/browser/profile_manager.h
+++ b/chrome/browser/profile_manager.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.
 
@@ -165,7 +165,7 @@ class ProfileManager : public NonThreadSafe,
   // default.
   bool logged_in_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ProfileManager);
+  DISALLOW_COPY_AND_ASSIGN(ProfileManager);
 };
 
 #endif  // CHROME_BROWSER_PROFILE_MANAGER_H__
diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h
index 544f49d..d8cef9f 100644
--- a/chrome/browser/search_engines/template_url_model.h
+++ b/chrome/browser/search_engines/template_url_model.h
@@ -377,7 +377,7 @@ class TemplateURLModel : public WebDataServiceConsumer,
   // List of extension IDs waiting for Load to have keywords registered.
   std::vector<std::string> pending_extension_ids_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(TemplateURLModel);
+  DISALLOW_COPY_AND_ASSIGN(TemplateURLModel);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index ff0d2af3d..bdc2641 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.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.
 
@@ -251,7 +251,7 @@ class ParsingContext {
   // URLs).
   bool derive_image_from_url_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ParsingContext);
+  DISALLOW_COPY_AND_ASSIGN(ParsingContext);
 };
 
 // static
diff --git a/chrome/browser/search_engines/template_url_parser.h b/chrome/browser/search_engines/template_url_parser.h
index 1a47a91..412544a 100644
--- a/chrome/browser/search_engines/template_url_parser.h
+++ b/chrome/browser/search_engines/template_url_parser.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.
 
@@ -41,7 +41,7 @@ class TemplateURLParser {
   // No one should create one of these.
   TemplateURLParser();
 
-  DISALLOW_EVIL_CONSTRUCTORS(TemplateURLParser);
+  DISALLOW_COPY_AND_ASSIGN(TemplateURLParser);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PARSER_H_
diff --git a/chrome/browser/search_engines/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc
index d3a6688..e99c68f 100644
--- a/chrome/browser/search_engines/template_url_parser_unittest.cc
+++ b/chrome/browser/search_engines/template_url_parser_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.
 
@@ -152,7 +152,7 @@ class ParamFilterImpl : public TemplateURLParser::ParameterFilter {
   std::string name_str_;
   std::string value_str_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ParamFilterImpl);
+  DISALLOW_COPY_AND_ASSIGN(ParamFilterImpl);
 };
 
 TEST_F(TemplateURLParserTest, TestFirefoxEbay) {
diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc
index 653cf7e..3d81695 100644
--- a/chrome/browser/search_engines/template_url_table_model.cc
+++ b/chrome/browser/search_engines/template_url_table_model.cc
@@ -114,7 +114,7 @@ class ModelEntry {
   TemplateURLTableModel* model_;
   CancelableRequestConsumer request_consumer_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ModelEntry);
+  DISALLOW_COPY_AND_ASSIGN(ModelEntry);
 };
 
 // TemplateURLTableModel -----------------------------------------
diff --git a/chrome/browser/search_engines/template_url_table_model.h b/chrome/browser/search_engines/template_url_table_model.h
index b13595d..e7a0d23 100644
--- a/chrome/browser/search_engines/template_url_table_model.h
+++ b/chrome/browser/search_engines/template_url_table_model.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.
 
@@ -103,7 +103,7 @@ class TemplateURLTableModel : public TableModel,
   // group boundaries.
   int last_search_engine_index_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(TemplateURLTableModel);
+  DISALLOW_COPY_AND_ASSIGN(TemplateURLTableModel);
 };
 
 
diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc
index f9de317..dfb1200 100644
--- a/chrome/browser/sessions/session_backend.cc
+++ b/chrome/browser/sessions/session_backend.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.
 
@@ -73,7 +73,7 @@ class SessionFileReader {
   // Number of available bytes; relative to buffer_position_.
   size_t available_count_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SessionFileReader);
+  DISALLOW_COPY_AND_ASSIGN(SessionFileReader);
 };
 
 bool SessionFileReader::Read(BaseSessionService::SessionType type,
diff --git a/chrome/browser/ssl/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h
index 1c8742b..087d8b5 100644
--- a/chrome/browser/ssl/ssl_error_info.h
+++ b/chrome/browser/ssl/ssl_error_info.h
@@ -15,7 +15,7 @@ class GURL;
 // This class describes an error that happened while showing a page over SSL.
 // An SSLErrorInfo object only exists on the UI thread and only contains
 // information about an error (type of error and text details).
-// Note no DISALLOW_EVIL_CONSTRUCTORS as we want the copy constructor.
+// Note no DISALLOW_COPY_AND_ASSIGN as we want the copy constructor.
 class SSLErrorInfo {
  public:
   enum ErrorType {
diff --git a/chrome/browser/tab_contents/web_drop_target_win.cc b/chrome/browser/tab_contents/web_drop_target_win.cc
index a9c6dd2..e43a291 100644
--- a/chrome/browser/tab_contents/web_drop_target_win.cc
+++ b/chrome/browser/tab_contents/web_drop_target_win.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.
 
@@ -78,7 +78,7 @@ class InterstitialDropTarget {
  private:
   TabContents* tab_contents_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(InterstitialDropTarget);
+  DISALLOW_COPY_AND_ASSIGN(InterstitialDropTarget);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/tab_contents/web_drop_target_win.h b/chrome/browser/tab_contents/web_drop_target_win.h
index 5b6188b1..c38ddac 100644
--- a/chrome/browser/tab_contents/web_drop_target_win.h
+++ b/chrome/browser/tab_contents/web_drop_target_win.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.
 
@@ -68,7 +68,7 @@ class WebDropTarget : public BaseDropTarget {
   // page is showing.
   scoped_ptr<InterstitialDropTarget> interstitial_drop_target_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WebDropTarget);
+  DISALLOW_COPY_AND_ASSIGN(WebDropTarget);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_WIN_H_
diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc
index c70ec75..c8924f0 100644
--- a/chrome/browser/views/constrained_window_win.cc
+++ b/chrome/browser/views/constrained_window_win.cc
@@ -117,7 +117,7 @@ class XPWindowResources : public views::WindowResources {
 
   static SkBitmap* bitmaps_[FRAME_PART_BITMAP_COUNT];
 
-  DISALLOW_EVIL_CONSTRUCTORS(XPWindowResources);
+  DISALLOW_COPY_AND_ASSIGN(XPWindowResources);
 };
 
 class VistaWindowResources : public views::WindowResources {
@@ -147,7 +147,7 @@ class VistaWindowResources : public views::WindowResources {
 
   static SkBitmap* bitmaps_[FRAME_PART_BITMAP_COUNT];
 
-  DISALLOW_EVIL_CONSTRUCTORS(VistaWindowResources);
+  DISALLOW_COPY_AND_ASSIGN(VistaWindowResources);
 };
 
 SkBitmap* XPWindowResources::bitmaps_[];
@@ -238,7 +238,7 @@ class ConstrainedWindowFrameView
   // The font to be used to render the titlebar text.
   static gfx::Font* title_font_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ConstrainedWindowFrameView);
+  DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowFrameView);
 };
 
 gfx::Font* ConstrainedWindowFrameView::title_font_ = NULL;
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h
index 559af54..66f9abf 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/views/frame/glass_browser_frame_view.h
@@ -95,7 +95,7 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView {
   static HICON throbber_icons_[kThrobberIconCount];
   static void InitThrobberIcons();
 
-  DISALLOW_EVIL_CONSTRUCTORS(GlassBrowserFrameView);
+  DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h
index afa1106..9493bd8 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.h
@@ -138,7 +138,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(OpaqueBrowserFrameView);
+  DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index c9db9cf..7d0e44b 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -58,7 +58,7 @@ class HungPagesTableModel : public views::GroupTableModel {
 
   TableModelObserver* observer_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(HungPagesTableModel);
+  DISALLOW_COPY_AND_ASSIGN(HungPagesTableModel);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -173,7 +173,7 @@ class HungRendererDialogView : public views::View,
     ButtonContainer() {}
     virtual ~ButtonContainer() {}
    private:
-    DISALLOW_EVIL_CONSTRUCTORS(ButtonContainer);
+    DISALLOW_COPY_AND_ASSIGN(ButtonContainer);
   };
   ButtonContainer* kill_button_container_;
 
@@ -191,7 +191,7 @@ class HungRendererDialogView : public views::View,
   // An amusing icon image.
   static SkBitmap* frozen_icon_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(HungRendererDialogView);
+  DISALLOW_COPY_AND_ASSIGN(HungRendererDialogView);
 };
 
 // static
diff --git a/chrome/browser/views/importer_lock_view.h b/chrome/browser/views/importer_lock_view.h
index 337b381..866d96e 100644
--- a/chrome/browser/views/importer_lock_view.h
+++ b/chrome/browser/views/importer_lock_view.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.
 
@@ -41,7 +41,7 @@ class ImporterLockView : public views::View,
 
   ImporterHost* importer_host_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ImporterLockView);
+  DISALLOW_COPY_AND_ASSIGN(ImporterLockView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_IMPORTER_LOCK_VIEW_H__
diff --git a/chrome/browser/views/importing_progress_view.h b/chrome/browser/views/importing_progress_view.h
index 71fdc74..5f70eb1 100644
--- a/chrome/browser/views/importing_progress_view.h
+++ b/chrome/browser/views/importing_progress_view.h
@@ -88,7 +88,7 @@ class ImportingProgressView : public views::View,
   // Are we importing a bookmarks.html file?
   bool bookmarks_import_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ImportingProgressView);
+  DISALLOW_COPY_AND_ASSIGN(ImportingProgressView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 5e5a24e..6745011 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -107,7 +107,7 @@ class FileDisplayArea : public views::View {
   static void InitClass();
   static SkBitmap default_folder_icon_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(FileDisplayArea);
+  DISALLOW_COPY_AND_ASSIGN(FileDisplayArea);
 };
 
 // static
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index 6d98fdd..f506400 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.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.
 
@@ -78,7 +78,7 @@ class ResetDefaultsConfirmBox : public views::DialogDelegate {
   MessageBoxView* message_box_view_;
   AdvancedPageView* advanced_page_view_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ResetDefaultsConfirmBox);
+  DISALLOW_COPY_AND_ASSIGN(ResetDefaultsConfirmBox);
 };
 
 }  // namespace
diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h
index 47c78b2..4c02f15 100644
--- a/chrome/browser/views/options/advanced_page_view.h
+++ b/chrome/browser/views/options/advanced_page_view.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.
 
@@ -39,7 +39,7 @@ class AdvancedPageView : public OptionsPageView,
   AdvancedScrollViewContainer* advanced_scroll_view_;
   views::NativeButton* reset_to_default_button_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AdvancedPageView);
+  DISALLOW_COPY_AND_ASSIGN(AdvancedPageView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_
diff --git a/chrome/browser/views/options/content_settings_window_view.h b/chrome/browser/views/options/content_settings_window_view.h
index 9bc8fcef..60b190c 100644
--- a/chrome/browser/views/options/content_settings_window_view.h
+++ b/chrome/browser/views/options/content_settings_window_view.h
@@ -66,7 +66,7 @@ class ContentSettingsWindowView : public views::View,
   // The last page the user was on when they opened the Options window.
   IntegerPrefMember last_selected_page_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ContentSettingsWindowView);
+  DISALLOW_COPY_AND_ASSIGN(ContentSettingsWindowView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_
diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h
index 72de18b..7342ad1 100644
--- a/chrome/browser/views/options/languages_page_view.h
+++ b/chrome/browser/views/options/languages_page_view.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.
 
@@ -112,7 +112,7 @@ class LanguagesPageView : public OptionsPageView,
   bool enable_spellcheck_checkbox_clicked_;
   bool enable_autospellcorrect_checkbox_clicked_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(LanguagesPageView);
+  DISALLOW_COPY_AND_ASSIGN(LanguagesPageView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGES_PAGE_VIEW_H__
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index a01cebe..76c219b 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -78,7 +78,7 @@ class OptionsWindowView : public views::View,
   // The last page the user was on when they opened the Options window.
   IntegerPrefMember last_selected_page_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(OptionsWindowView);
+  DISALLOW_COPY_AND_ASSIGN(OptionsWindowView);
 };
 
 // static
diff --git a/chrome/browser/views/restart_message_box.h b/chrome/browser/views/restart_message_box.h
index a5dcad4..895937c 100644
--- a/chrome/browser/views/restart_message_box.h
+++ b/chrome/browser/views/restart_message_box.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 RestartMessageBox : public views::DialogDelegate {
 
   MessageBoxView* message_box_view_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(RestartMessageBox);
+  DISALLOW_COPY_AND_ASSIGN(RestartMessageBox);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_
diff --git a/chrome/browser/visitedlink_master.h b/chrome/browser/visitedlink_master.h
index 169a765..24b6499 100644
--- a/chrome/browser/visitedlink_master.h
+++ b/chrome/browser/visitedlink_master.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.
 
@@ -369,7 +369,7 @@ class VisitedLinkMaster : public VisitedLinkCommon {
   // will be false in production.
   bool suppress_rebuild_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(VisitedLinkMaster);
+  DISALLOW_COPY_AND_ASSIGN(VisitedLinkMaster);
 };
 
 // NOTE: These methods are defined inline here, so we can share the compilation
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 5512c78..a5105b2 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.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.
 
@@ -111,7 +111,7 @@ class WDTypedResult {
 
  private:
   WDResultType type_;
-  DISALLOW_EVIL_CONSTRUCTORS(WDTypedResult);
+  DISALLOW_COPY_AND_ASSIGN(WDTypedResult);
 };
 
 // A result containing one specific pointer or literal value.
@@ -132,7 +132,7 @@ template <class T> class WDResult : public WDTypedResult {
  private:
   T value_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WDResult);
+  DISALLOW_COPY_AND_ASSIGN(WDResult);
 };
 
 template <class T> class WDObjectResult : public WDTypedResult {
@@ -147,7 +147,7 @@ template <class T> class WDObjectResult : public WDTypedResult {
  private:
   // mutable to keep GetValue() const.
   mutable T value_;
-  DISALLOW_EVIL_CONSTRUCTORS(WDObjectResult);
+  DISALLOW_COPY_AND_ASSIGN(WDObjectResult);
 };
 
 class WebDataServiceConsumer;
@@ -199,7 +199,7 @@ class WebDataService
     WebDataServiceConsumer* consumer_;
     WDTypedResult* result_;
 
-    DISALLOW_EVIL_CONSTRUCTORS(WebDataRequest);
+    DISALLOW_COPY_AND_ASSIGN(WebDataRequest);
   };
 
   //
@@ -595,7 +595,7 @@ class WebDataService
   // MessageLoop the WebDataService is created on.
   MessageLoop* main_loop_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WebDataService);
+  DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/window_sizer.cc b/chrome/browser/window_sizer.cc
index fe6f825..74e1af4 100644
--- a/chrome/browser/window_sizer.cc
+++ b/chrome/browser/window_sizer.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.
 
@@ -103,7 +103,7 @@ class DefaultStateProvider : public WindowSizer::StateProvider {
 
   // If set, is used as the reference browser for GetLastActiveWindowState.
   Browser* browser_;
-  DISALLOW_EVIL_CONSTRUCTORS(DefaultStateProvider);
+  DISALLOW_COPY_AND_ASSIGN(DefaultStateProvider);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/window_sizer.h b/chrome/browser/window_sizer.h
index 3981acb..33d4574 100644
--- a/chrome/browser/window_sizer.h
+++ b/chrome/browser/window_sizer.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.
 
@@ -176,7 +176,7 @@ class WindowSizer {
   StateProvider* state_provider_;
   MonitorInfoProvider* monitor_info_provider_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WindowSizer);
+  DISALLOW_COPY_AND_ASSIGN(WindowSizer);
 };
 
 #endif  // CHROME_BROWSER_WINDOW_SIZER_H_
diff --git a/chrome/common/net/url_fetcher.h b/chrome/common/net/url_fetcher.h
index 519480e..763a660 100644
--- a/chrome/common/net/url_fetcher.h
+++ b/chrome/common/net/url_fetcher.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.
 //
@@ -189,7 +189,7 @@ class URLFetcher {
 
   static bool g_interception_enabled;
 
-  DISALLOW_EVIL_CONSTRUCTORS(URLFetcher);
+  DISALLOW_COPY_AND_ASSIGN(URLFetcher);
 };
 
 #endif  // CHROME_COMMON_NET_URL_FETCHER_H_
diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h
index f2ccb42..0622985 100644
--- a/chrome/installer/util/install_util.h
+++ b/chrome/installer/util/install_util.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.
 //
@@ -100,7 +100,7 @@ class InstallUtil {
                                        WorkItemList* registration_list);
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(InstallUtil);
+  DISALLOW_COPY_AND_ASSIGN(InstallUtil);
 };
 
 
diff --git a/chrome/plugin/plugin_channel.h b/chrome/plugin/plugin_channel.h
index 609316a6..50d788c 100644
--- a/chrome/plugin/plugin_channel.h
+++ b/chrome/plugin/plugin_channel.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.
 
@@ -103,7 +103,7 @@ class PluginChannel : public PluginChannelBase {
   bool off_the_record_; // True if the renderer is in off the record mode.
   scoped_refptr<MessageFilter> filter_;  // Handles the modal dialog events.
 
-  DISALLOW_EVIL_CONSTRUCTORS(PluginChannel);
+  DISALLOW_COPY_AND_ASSIGN(PluginChannel);
 };
 
 #endif  // CHROME_PLUGIN_PLUGIN_CHANNEL_H_
diff --git a/chrome/plugin/plugin_thread.h b/chrome/plugin/plugin_thread.h
index deca8d4..a9d2b3b 100644
--- a/chrome/plugin/plugin_thread.h
+++ b/chrome/plugin/plugin_thread.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.
 
@@ -47,7 +47,7 @@ class PluginThread : public ChildThread {
   // Points to the plugin file that this process hosts.
   FilePath plugin_path_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PluginThread);
+  DISALLOW_COPY_AND_ASSIGN(PluginThread);
 };
 
 #endif  // CHROME_PLUGIN_PLUGIN_THREAD_H_
diff --git a/chrome/renderer/about_handler.h b/chrome/renderer/about_handler.h
index d79f341..3c811b3 100644
--- a/chrome/renderer/about_handler.h
+++ b/chrome/renderer/about_handler.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.
 
@@ -37,7 +37,7 @@ class AboutHandler {
   AboutHandler();
   ~AboutHandler();
 
-  DISALLOW_EVIL_CONSTRUCTORS(AboutHandler);
+  DISALLOW_COPY_AND_ASSIGN(AboutHandler);
 };
 
 #endif  // CHROME_RENDERER_ABOUT_HANDLER_H__
diff --git a/chrome/renderer/net/render_dns_master.h b/chrome/renderer/net/render_dns_master.h
index fa735de..15c100f 100644
--- a/chrome/renderer/net/render_dns_master.h
+++ b/chrome/renderer/net/render_dns_master.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.
 
@@ -103,7 +103,7 @@ class RenderDnsMaster {
 
   ScopedRunnableMethodFactory<RenderDnsMaster> render_dns_factory_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(RenderDnsMaster);
+  DISALLOW_COPY_AND_ASSIGN(RenderDnsMaster);
 };  // class RenderDnsMaster
 
 #endif  // CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
diff --git a/chrome/renderer/net/render_dns_queue.h b/chrome/renderer/net/render_dns_queue.h
index 351d393..78e8e36 100644
--- a/chrome/renderer/net/render_dns_queue.h
+++ b/chrome/renderer/net/render_dns_queue.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 DnsQueue {
   // Number of queued strings
   size_t size_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(DnsQueue);
+  DISALLOW_COPY_AND_ASSIGN(DnsQueue);
 };  // class DnsQueue
 
 #endif  // CHROME_RENDERER_NET_RENDER_DNS_QUEUE_H__
diff --git a/chrome/renderer/net/render_dns_queue_unittest.cc b/chrome/renderer/net/render_dns_queue_unittest.cc
index e2cccb0..eead742 100644
--- a/chrome/renderer/net/render_dns_queue_unittest.cc
+++ b/chrome/renderer/net/render_dns_queue_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.
 
@@ -32,7 +32,7 @@ class DnsQueueSequentialTester {
   DnsQueue* buffer_;
   int32 read_counter_;  // expected value of next read string.
   int32 write_counter_;  // Numerical value to write next string.
-  DISALLOW_EVIL_CONSTRUCTORS(DnsQueueSequentialTester);
+  DISALLOW_COPY_AND_ASSIGN(DnsQueueSequentialTester);
 };
 
 
diff --git a/chrome/renderer/plugin_channel_host.cc b/chrome/renderer/plugin_channel_host.cc
index dd14530..aacc3d2 100644
--- a/chrome/renderer/plugin_channel_host.cc
+++ b/chrome/renderer/plugin_channel_host.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.
 
@@ -29,7 +29,7 @@ class IsListeningFilter : public IPC::ChannelProxy::MessageFilter {
  private:
   IPC::Channel* channel_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(IsListeningFilter);
+  DISALLOW_COPY_AND_ASSIGN(IsListeningFilter);
 };
 
 bool IsListeningFilter::OnMessageReceived(const IPC::Message& message) {
diff --git a/chrome/renderer/plugin_channel_host.h b/chrome/renderer/plugin_channel_host.h
index 668c875..16464b9 100644
--- a/chrome/renderer/plugin_channel_host.h
+++ b/chrome/renderer/plugin_channel_host.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 PluginChannelHost : public PluginChannelBase {
   // don't treat it as a crash.
   bool expecting_shutdown_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PluginChannelHost);
+  DISALLOW_COPY_AND_ASSIGN(PluginChannelHost);
 };
 
 #endif  // CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
diff --git a/chrome/test/automation/autocomplete_edit_proxy.h b/chrome/test/automation/autocomplete_edit_proxy.h
index abbe849..ae5df8f 100644
--- a/chrome/test/automation/autocomplete_edit_proxy.h
+++ b/chrome/test/automation/autocomplete_edit_proxy.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 AutocompleteEditProxy : public AutomationResourceProxy {
   bool WaitForQuery(int wait_timeout_ms) const;
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(AutocompleteEditProxy);
+  DISALLOW_COPY_AND_ASSIGN(AutocompleteEditProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H_
diff --git a/chrome/test/automation/automation_handle_tracker.h b/chrome/test/automation/automation_handle_tracker.h
index fc33600..26ca976 100644
--- a/chrome/test/automation/automation_handle_tracker.h
+++ b/chrome/test/automation/automation_handle_tracker.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.
 
@@ -61,7 +61,7 @@ class AutomationResourceProxy
   // still exists.
   bool is_valid_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AutomationResourceProxy);
+  DISALLOW_COPY_AND_ASSIGN(AutomationResourceProxy);
 };
 
 // This class keeps track of the mapping between AutomationHandles and
@@ -107,7 +107,7 @@ class AutomationHandleTracker {
 
   Lock map_lock_;
   IPC::Channel* channel_;
-  DISALLOW_EVIL_CONSTRUCTORS(AutomationHandleTracker);
+  DISALLOW_COPY_AND_ASSIGN(AutomationHandleTracker);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_HANDLE_TRACKER_H__
diff --git a/chrome/test/file_test_utils.h b/chrome/test/file_test_utils.h
index 22368b9..1b5fc22 100644
--- a/chrome/test/file_test_utils.h
+++ b/chrome/test/file_test_utils.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.
 
@@ -18,7 +18,7 @@ class FileAutoDeleter {
   const FilePath& path() { return path_; }
  private:
   FilePath path_;
-  DISALLOW_EVIL_CONSTRUCTORS(FileAutoDeleter);
+  DISALLOW_COPY_AND_ASSIGN(FileAutoDeleter);
 };
 
 #endif  // CHROME_TEST_FILE_TEST_UTILS_H_
diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.h b/chrome/test/mini_installer_test/mini_installer_test_util.h
index f0181d1..0153b10 100644
--- a/chrome/test/mini_installer_test/mini_installer_test_util.h
+++ b/chrome/test/mini_installer_test/mini_installer_test_util.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.
 //
@@ -96,7 +96,7 @@ class MiniInstallerTestUtil {
   static bool VerifyProcessClose(const wchar_t* process_name);
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(MiniInstallerTestUtil);
+  DISALLOW_COPY_AND_ASSIGN(MiniInstallerTestUtil);
 };
 
 #endif  // CHROME_TEST_MINI_INSTALLER_TEST_MINI_INSTALLER_TEST_UTIL_H_
diff --git a/chrome/tools/crash_service/crash_service.h b/chrome/tools/crash_service/crash_service.h
index 8269fb2..18d745a 100644
--- a/chrome/tools/crash_service/crash_service.h
+++ b/chrome/tools/crash_service/crash_service.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.
 
@@ -113,7 +113,7 @@ class CrashService {
   volatile long clients_terminated_;
   Lock sending_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CrashService);
+  DISALLOW_COPY_AND_ASSIGN(CrashService);
 };
 
 #endif  // CHROME_TOOLS_CRASH_SERVICE_CRASH_SERVICE_H_