And now NewRunnableMethod(), you die.

Kill off NewRunnableMethod() and remove silly declarations of unused ScopedRunnableMethodFactory(s).

BUG=none
TEST=existing.

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

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

3 files changed, 3 insertions, 19 deletions

diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index 52968bd..1c8796b 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -722,11 +722,6 @@ static base::LazyInstance<base::Lock,
 // The singleton of this class.
 static WatchDogThread* g_watchdog_thread = NULL;
 
-
-// The WatchDogThread object must outlive any tasks posted to the IO thread
-// before the Quit task.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(WatchDogThread);
-
 WatchDogThread::WatchDogThread() : Thread("BrowserWatchdog") {
 }
 
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
index 9eaccd9..d876caf 100644
--- a/chrome/browser/metrics/thread_watcher.h
+++ b/chrome/browser/metrics/thread_watcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -549,9 +549,4 @@ class ShutdownWatcherHelper {
   DISALLOW_COPY_AND_ASSIGN(ShutdownWatcherHelper);
 };
 
-// DISABLE_RUNNABLE_METHOD_REFCOUNT is a convenience macro for disabling
-// refcounting of ThreadWatcher and ThreadWatcherList classes.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(ThreadWatcher);
-DISABLE_RUNNABLE_METHOD_REFCOUNT(ThreadWatcherList);
-
 #endif  // CHROME_BROWSER_METRICS_THREAD_WATCHER_H_
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index dac63cf..6c0bfbb 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -230,8 +230,6 @@ class CustomThreadWatcher : public ThreadWatcher {
   }
 };
 
-DISABLE_RUNNABLE_METHOD_REFCOUNT(CustomThreadWatcher);
-
 class ThreadWatcherTest : public ::testing::Test {
  public:
   static const TimeDelta kSleepTime;
@@ -317,10 +315,6 @@ class ThreadWatcherTest : public ::testing::Test {
   scoped_ptr<WatchDogThread> watchdog_thread_;
 };
 
-// DISABLE_RUNNABLE_METHOD_REFCOUNT is a convenience macro for disabling
-// refcounting of ThreadWatcherTest classes.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(ThreadWatcherTest);
-
 // Define static constants.
 const TimeDelta ThreadWatcherTest::kSleepTime =
     TimeDelta::FromMilliseconds(50);