diff options
Diffstat (limited to 'chrome')
18 files changed, 21 insertions, 77 deletions
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 44f697e..25ef011 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.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. @@ -61,10 +61,6 @@ using content::BrowserThread; using content::DownloadManager; using content::UserMetricsAction; -// Done so that we can use PostTask on BrowsingDataRemovers and not have -// BrowsingDataRemover implement RefCounted. -DISABLE_RUNNABLE_METHOD_REFCOUNT(BrowsingDataRemover); - bool BrowsingDataRemover::removing_ = false; BrowsingDataRemover::NotificationDetails::NotificationDetails() diff --git a/chrome/browser/chromeos/audio_handler.h b/chrome/browser/chromeos/audio_handler.h index 2d99808..0051a07 100644 --- a/chrome/browser/chromeos/audio_handler.h +++ b/chrome/browser/chromeos/audio_handler.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. @@ -64,6 +64,4 @@ class AudioHandler { } // namespace chromeos -DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::AudioHandler); - #endif // CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_ diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 5aa499f..bb32a82 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -171,10 +171,6 @@ class StubLogin : public chromeos::LoginStatusConsumer, bool profile_prepared_; }; -// Allows authenticator to be invoked without adding refcounting. The instances -// will delete themselves upon completion. -DISABLE_RUNNABLE_METHOD_REFCOUNT(StubLogin); - void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line, Profile* profile) { if (parsed_command_line.HasSwitch(switches::kLoginManager)) { diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index 27e504d..ea04841 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.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. @@ -69,8 +69,6 @@ const int kRetriesDelayInSec = 2; } // anonymous namespace -DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::ServicesCustomizationDocument); - namespace chromeos { // CustomizationDocument implementation. --------------------------------------- diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc index 3729be5..a54d195 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager.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. @@ -1430,8 +1430,3 @@ InputMethodManager* InputMethodManager::GetInstance() { } // namespace input_method } // namespace chromeos - -// Allows InvokeLater without adding refcounting. This class is a Singleton and -// won't be deleted until it's last InvokeLater is run. -DISABLE_RUNNABLE_METHOD_REFCOUNT( - chromeos::input_method::InputMethodManagerImpl); diff --git a/chrome/browser/chromeos/login/ownership_service.cc b/chrome/browser/chromeos/login/ownership_service.cc index 6e7fa1e..6d3cf6a 100644 --- a/chrome/browser/chromeos/login/ownership_service.cc +++ b/chrome/browser/chromeos/login/ownership_service.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. @@ -55,8 +55,8 @@ void OwnershipService::Prewarm() { // This can happen only for particular test: OwnershipServiceTest. It uses // mocks and for that uses OwnershipService not as a regular singleton but // as a resurrecting object. This behaviour conflicts with - // DISABLE_RUNNABLE_METHOD_REFCOUNT. So avoid posting task in those - // circumstances in order to avoid accessing already deleted object. + // base::Unretained(). So avoid posting task in those circumstances + // in order to avoid accessing already deleted object. } } diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc index f3cb2db..4642824 100644 --- a/chrome/browser/chromeos/media/media_player.cc +++ b/chrome/browser/chromeos/media/media_player.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. @@ -75,10 +75,6 @@ int MediaPlayer::GetPlaylistPosition() const { // //////////////////////////////////////////////////////////////////////////////// -// Allows InvokeLater without adding refcounting. This class is a Singleton and -// won't be deleted until it's last InvokeLater is run. -DISABLE_RUNNABLE_METHOD_REFCOUNT(MediaPlayer); - MediaPlayer::~MediaPlayer() { } diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc index 852696a..9ed9a1d 100644 --- a/chrome/browser/chromeos/mobile_config.cc +++ b/chrome/browser/chromeos/mobile_config.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. @@ -56,8 +56,6 @@ const char kLocalCarrierConfigPath[] = } // anonymous namespace -DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::MobileConfig); - namespace chromeos { // MobileConfig::CarrierDeal implementation. ----------------------------------- diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 2ae6073..dba30db 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_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. @@ -64,11 +64,6 @@ namespace history { class HistoryTest; } -// Specialize RunnableMethodTraits for HistoryTest so we can create callbacks. -// None of these callbacks can outlast the test, so there is not need to retain -// the HistoryTest object. -DISABLE_RUNNABLE_METHOD_REFCOUNT(history::HistoryTest); - namespace history { namespace { 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); diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 54c03fa..be02c16 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.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. @@ -697,10 +697,10 @@ void Predictor::FinalizeInitializationOnIOThread( initial_observer_.reset(new InitialObserver()); host_resolver_ = io_thread->globals()->host_resolver.get(); - // ScopedRunnableMethodFactory instances need to be created and destroyed + // base::WeakPtrFactory instances need to be created and destroyed // on the same thread. The predictor lives on the IO thread and will die // from there so now that we're on the IO thread we need to properly - // initialize the ScopedrunnableMethodFactory. + // initialize the base::WeakPtrFactory. // TODO(groby): Check if WeakPtrFactory has the same constraint. weak_factory_.reset(new base::WeakPtrFactory<Predictor>(this)); diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index fdaa7e2..f7a1eed 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.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. @@ -256,8 +256,6 @@ ServiceProcessControl* ServiceProcessControl::GetInstance() { return Singleton<ServiceProcessControl>::get(); } -DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControl); - ServiceProcessControl::Launcher::Launcher(ServiceProcessControl* process, CommandLine* cmd_line) : process_(process), diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc index f269b85..638ec51 100644 --- a/chrome/browser/service/service_process_control_browsertest.cc +++ b/chrome/browser/service/service_process_control_browsertest.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. @@ -203,5 +203,3 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) { // Disconnect from service process. ServiceProcessControl::GetInstance()->Disconnect(); } - -DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControlBrowserTest); diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h index 4468bca..8859304 100644 --- a/chrome/service/service_process.h +++ b/chrome/service/service_process.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. @@ -142,10 +142,6 @@ class ServiceProcess : public CloudPrintProxy::Client { DISALLOW_COPY_AND_ASSIGN(ServiceProcess); }; -// Disable refcounting for runnable method because it is really not needed -// when we post tasks on the main message loop. -DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess); - extern ServiceProcess* g_service_process; #endif // CHROME_SERVICE_SERVICE_PROCESS_H_ diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h index 295f844..861f53a 100644 --- a/chrome/test/webdriver/webdriver_automation.h +++ b/chrome/test/webdriver/webdriver_automation.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. @@ -241,6 +241,4 @@ class Automation { } // namespace webdriver -DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); - #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ diff --git a/chrome/test/webdriver/webdriver_session.h b/chrome/test/webdriver/webdriver_session.h index 80a4e18..6fb7cee 100644 --- a/chrome/test/webdriver/webdriver_session.h +++ b/chrome/test/webdriver/webdriver_session.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. @@ -443,6 +443,4 @@ class Session { } // namespace webdriver -DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Session); - #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ |