diff options
Diffstat (limited to 'chrome')
133 files changed, 183 insertions, 199 deletions
diff --git a/chrome/browser/android/feedback/connectivity_checker.cc b/chrome/browser/android/feedback/connectivity_checker.cc index 11d1037..5e70d34 100644 --- a/chrome/browser/android/feedback/connectivity_checker.cc +++ b/chrome/browser/android/feedback/connectivity_checker.cc @@ -100,7 +100,7 @@ class ConnectivityChecker : public net::URLFetcherDelegate { // has already happened, and no further action should be taken. bool is_being_destroyed_; - scoped_ptr<base::OneShotTimer<ConnectivityChecker>> expiration_timer_; + scoped_ptr<base::OneShotTimer> expiration_timer_; }; void ConnectivityChecker::OnURLFetchComplete(const net::URLFetcher* source) { @@ -147,7 +147,7 @@ void ConnectivityChecker::StartAsyncCheck() { net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SEND_AUTH_DATA); url_fetcher_->Start(); - expiration_timer_.reset(new base::OneShotTimer<ConnectivityChecker>()); + expiration_timer_.reset(new base::OneShotTimer()); expiration_timer_->Start(FROM_HERE, timeout_, this, &ConnectivityChecker::OnTimeout); } diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index d581f80..75657dd 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc @@ -80,7 +80,7 @@ class ZeroSuggestPrefetcher : public AutocompleteControllerDelegate { void OnResultChanged(bool default_match_changed) override; scoped_ptr<AutocompleteController> controller_; - base::OneShotTimer<ZeroSuggestPrefetcher> expire_timer_; + base::OneShotTimer expire_timer_; }; ZeroSuggestPrefetcher::ZeroSuggestPrefetcher(Profile* profile) diff --git a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc index 9d5f323..a05faa3 100644 --- a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc +++ b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc @@ -213,8 +213,7 @@ class DriveAppProviderTest : public ExtensionBrowserTest, scoped_ptr<drive::DriveAppRegistry> apps_registry_; scoped_ptr<DriveAppProvider> provider_; - base::RepeatingTimer<DriveAppProviderTest> - pending_drive_app_converter_check_timer_; + base::RepeatingTimer pending_drive_app_converter_check_timer_; scoped_refptr<content::MessageLoopRunner> runner_; DISALLOW_COPY_AND_ASSIGN(DriveAppProviderTest); diff --git a/chrome/browser/apps/ephemeral_app_service.h b/chrome/browser/apps/ephemeral_app_service.h index 76a7213..b4c0de4 100644 --- a/chrome/browser/apps/ephemeral_app_service.h +++ b/chrome/browser/apps/ephemeral_app_service.h @@ -93,7 +93,7 @@ class EphemeralAppService : public KeyedService, ScopedObserver<apps::AppLifetimeMonitor, apps::AppLifetimeMonitor::Observer> app_lifetime_monitor_observer_; - base::OneShotTimer<EphemeralAppService> garbage_collect_apps_timer_; + base::OneShotTimer garbage_collect_apps_timer_; // The count of cached ephemeral apps. int ephemeral_app_count_; diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index baa46e6..ac45964 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -271,7 +271,7 @@ class BrowserProcessImpl : public BrowserProcess, scoped_ptr<web_resource::PromoResourceService> promo_resource_service_; #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - base::RepeatingTimer<BrowserProcessImpl> autoupdate_timer_; + base::RepeatingTimer autoupdate_timer_; // Gets called by autoupdate timer to see if browser needs restart and can be // restarted, and if that's the case, restarts the browser. diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h index dbe07de..278d825 100644 --- a/chrome/browser/captive_portal/captive_portal_service.h +++ b/chrome/browser/captive_portal/captive_portal_service.h @@ -190,7 +190,7 @@ class CaptivePortalService : public KeyedService, public base::NonThreadSafe { // the Link Doctor. BooleanPrefMember resolve_errors_with_web_service_; - base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_; + base::OneShotTimer check_captive_portal_timer_; static TestingState testing_state_; diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader.h b/chrome/browser/captive_portal/captive_portal_tab_reloader.h index db6b122..2fe64a7 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_reloader.h +++ b/chrome/browser/captive_portal/captive_portal_tab_reloader.h @@ -126,7 +126,7 @@ class CaptivePortalTabReloader { // STATE_TIMER_RUNNING. Stopped on any state change, including when a page // commits or there's an error. If the timer triggers, the state switches to // STATE_MAYBE_BROKEN_BY_PORTAL and |this| kicks off a captive portal check. - base::OneShotTimer<CaptivePortalTabReloader> slow_ssl_load_timer_; + base::OneShotTimer slow_ssl_load_timer_; private: friend class CaptivePortalBrowserTest; diff --git a/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc index 242ace5..45c457f 100644 --- a/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc @@ -69,7 +69,7 @@ class MagnifierAnimationWaiter { : controller_(controller) {} void Wait() { - base::RepeatingTimer<MagnifierAnimationWaiter> check_timer; + base::RepeatingTimer check_timer; check_timer.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(10), this, &MagnifierAnimationWaiter::OnTimer); runner_ = new content::MessageLoopRunner; diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h index a61af71..013e4d1 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h @@ -68,7 +68,7 @@ class KioskAppUpdateService : public KeyedService, std::string app_id_; // After we detect an upgrade we start a one-short timer to force restart. - base::OneShotTimer<KioskAppUpdateService> restart_timer_; + base::OneShotTimer restart_timer_; system::AutomaticRebootManager* automatic_reboot_manager_; // Not owned. diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h index 0b844dc..886f82a 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h +++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h @@ -45,7 +45,7 @@ class KioskModeIdleAppNameNotification : public ui::UserActivityObserver, // Invoked by |timer_| to display the application idle message. void OnTimeout(); - base::OneShotTimer<KioskModeIdleAppNameNotification> timer_; + base::OneShotTimer timer_; // If set the notification should get shown upon next user activity. bool show_notification_upon_next_user_activity_; diff --git a/chrome/browser/chromeos/camera_presence_notifier.h b/chrome/browser/chromeos/camera_presence_notifier.h index d9e9170..423247c 100644 --- a/chrome/browser/chromeos/camera_presence_notifier.h +++ b/chrome/browser/chromeos/camera_presence_notifier.h @@ -40,7 +40,7 @@ class CameraPresenceNotifier { bool camera_present_on_last_check_; // Timer for camera check cycle. - base::RepeatingTimer<CameraPresenceNotifier> camera_check_timer_; + base::RepeatingTimer camera_check_timer_; base::ObserverList<Observer> observers_; diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h b/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h index 5218d1c..a3fa728 100644 --- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h +++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h @@ -93,7 +93,7 @@ class CustomizationWallpaperDownloader : public net::URLFetcherDelegate { const base::FilePath wallpaper_temporary_file_; // Pending retry. - base::OneShotTimer<CustomizationWallpaperDownloader> request_scheduled_; + base::OneShotTimer request_scheduled_; // Number of download retries (first attempt is not counted as retry). size_t retries_; diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h index 369032f..9a99cca 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.h +++ b/chrome/browser/chromeos/extensions/install_limiter.h @@ -78,7 +78,7 @@ class InstallLimiter : public KeyedService, CrxInstallerSet running_installers_; // A timer to wait before running deferred big app install. - base::OneShotTimer<InstallLimiter> wait_timer_; + base::OneShotTimer wait_timer_; bool disabled_for_test_; diff --git a/chrome/browser/chromeos/file_system_provider/request_manager.h b/chrome/browser/chromeos/file_system_provider/request_manager.h index 83cd002..68ab0be 100644 --- a/chrome/browser/chromeos/file_system_provider/request_manager.h +++ b/chrome/browser/chromeos/file_system_provider/request_manager.h @@ -149,7 +149,7 @@ class RequestManager { ~Request(); // Timer for discarding the request during a timeout. - base::OneShotTimer<RequestManager> timeout_timer; + base::OneShotTimer timeout_timer; // Handler tied to this request. scoped_ptr<HandlerInterface> handler; diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.h b/chrome/browser/chromeos/first_run/drive_first_run_controller.h index e062694..3375b90 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.h +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.h @@ -78,8 +78,8 @@ class DriveFirstRunController { Profile* profile_; scoped_ptr<DriveWebContentsManager> web_contents_manager_; - base::OneShotTimer<DriveFirstRunController> web_contents_timer_; - base::OneShotTimer<DriveFirstRunController> initial_delay_timer_; + base::OneShotTimer web_contents_timer_; + base::OneShotTimer initial_delay_timer_; bool started_; base::ObserverList<Observer> observer_list_; diff --git a/chrome/browser/chromeos/idle_detector.h b/chrome/browser/chromeos/idle_detector.h index fc3e45d..7d13fb8 100644 --- a/chrome/browser/chromeos/idle_detector.h +++ b/chrome/browser/chromeos/idle_detector.h @@ -28,7 +28,7 @@ class IdleDetector : public ui::UserActivityObserver { // Resets |timer_| to fire when we reach our idle timeout. void ResetTimer(); - base::OneShotTimer<IdleDetector> timer_; + base::OneShotTimer timer_; base::Closure idle_callback_; diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h index b1b669c..1c9f34f 100644 --- a/chrome/browser/chromeos/login/app_launch_controller.h +++ b/chrome/browser/chromeos/login/app_launch_controller.h @@ -128,9 +128,9 @@ class AppLaunchController bool launcher_ready_; // A timer to ensure the app splash is shown for a minimum amount of time. - base::OneShotTimer<AppLaunchController> splash_wait_timer_; + base::OneShotTimer splash_wait_timer_; - base::OneShotTimer<AppLaunchController> network_wait_timer_; + base::OneShotTimer network_wait_timer_; bool waiting_for_network_; bool network_wait_timedout_; bool showing_network_dialog_; diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc index 73bea6e..9222573 100644 --- a/chrome/browser/chromeos/login/chrome_restart_request.cc +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc @@ -259,7 +259,7 @@ class ChromeRestartRequest void RestartJob(); const std::vector<std::string> argv_; - base::OneShotTimer<ChromeRestartRequest> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(ChromeRestartRequest); }; diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 3db4024..97baaa0 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -901,7 +901,7 @@ void ExistingUserController::StartPublicSessionAutoLoginTimer() { // Start the auto-login timer. if (!auto_login_timer_) - auto_login_timer_.reset(new base::OneShotTimer<ExistingUserController>); + auto_login_timer_.reset(new base::OneShotTimer); auto_login_timer_->Start( FROM_HERE, diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index 0df5d28..ee963b2 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h @@ -240,7 +240,7 @@ class ExistingUserController : public LoginDisplay::Delegate, void OnOAuth2TokensFetched(bool success, const UserContext& user_context); // Public session auto-login timer. - scoped_ptr<base::OneShotTimer<ExistingUserController> > auto_login_timer_; + scoped_ptr<base::OneShotTimer> auto_login_timer_; // Public session auto-login timeout, in milliseconds. int public_session_auto_login_delay_; @@ -302,7 +302,7 @@ class ExistingUserController : public LoginDisplay::Delegate, base::Time time_init_; // Timer for the interval to wait for the reboot after TPM error UI was shown. - base::OneShotTimer<ExistingUserController> reboot_timer_; + base::OneShotTimer reboot_timer_; scoped_ptr<login::NetworkStateHelper> network_state_helper_; diff --git a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc index f59b399..0725453 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc @@ -104,7 +104,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test { } // ExistingUserController private member accessors. - base::OneShotTimer<ExistingUserController>* auto_login_timer() { + base::OneShotTimer* auto_login_timer() { return existing_user_controller()->auto_login_timer_.get(); } diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 0402be7..6192072 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -192,7 +192,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest { } // ExistingUserController private member accessors. - base::OneShotTimer<ExistingUserController>* auto_login_timer() { + base::OneShotTimer* auto_login_timer() { return existing_user_controller()->auto_login_timer_.get(); } @@ -559,7 +559,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, // Wait for the timer to fire. base::RunLoop runner; - base::OneShotTimer<base::RunLoop> timer; + base::OneShotTimer timer; timer.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kAutoLoginShortDelay + 1), runner.QuitClosure()); diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index e8b1dc7e..9079645 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -260,7 +260,7 @@ class JsConditionWaiter { if (CheckJs()) return; - base::RepeatingTimer<JsConditionWaiter> check_timer; + base::RepeatingTimer check_timer; check_timer.Start( FROM_HERE, base::TimeDelta::FromMilliseconds(10), diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc index 42ee55c..826aa1c 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc @@ -127,8 +127,7 @@ void SAMLOfflineSigninLimiter::UpdateLimit() { // Arm |offline_signin_limit_timer_| so that it sets the flag enforcing online // login when the limit expires. - offline_signin_limit_timer_.reset( - new base::OneShotTimer<SAMLOfflineSigninLimiter>); + offline_signin_limit_timer_.reset(new base::OneShotTimer); offline_signin_limit_timer_->Start( FROM_HERE, offline_signin_time_limit - time_since_last_gaia_signin, diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h index dca8d61..e6cdd2b 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h @@ -66,8 +66,7 @@ class SAMLOfflineSigninLimiter : public KeyedService { PrefChangeRegistrar pref_change_registrar_; - scoped_ptr<base::OneShotTimer<SAMLOfflineSigninLimiter> > - offline_signin_limit_timer_; + scoped_ptr<base::OneShotTimer> offline_signin_limit_timer_; DISALLOW_COPY_AND_ASSIGN(SAMLOfflineSigninLimiter); }; diff --git a/chrome/browser/chromeos/login/screens/network_screen.h b/chrome/browser/chromeos/login/screens/network_screen.h index d5c96bc..9746a39 100644 --- a/chrome/browser/chromeos/login/screens/network_screen.h +++ b/chrome/browser/chromeos/login/screens/network_screen.h @@ -162,7 +162,7 @@ class NetworkScreen : public NetworkModel, bool continue_pressed_; // Timer for connection timeout. - base::OneShotTimer<NetworkScreen> connection_timer_; + base::OneShotTimer connection_timer_; scoped_ptr<CrosSettings::ObserverSubscription> timezone_subscription_; diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h index 8d19eb8..1d8aa1d 100644 --- a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h +++ b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h @@ -60,7 +60,7 @@ class TermsOfServiceScreen : public BaseScreen, // Timer that enforces a custom (shorter) timeout on the attempt to download // the Terms of Service. - base::OneShotTimer<TermsOfServiceScreen> download_timer_; + base::OneShotTimer download_timer_; DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreen); }; diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc index 995b9a8..f7d0c99 100644 --- a/chrome/browser/chromeos/login/screens/update_screen.cc +++ b/chrome/browser/chromeos/login/screens/update_screen.cc @@ -593,8 +593,7 @@ void UpdateScreen::DelayErrorMessage() { &UpdateScreen::ShowErrorMessage); } -base::OneShotTimer<UpdateScreen>& -UpdateScreen::GetErrorMessageTimerForTesting() { +base::OneShotTimer& UpdateScreen::GetErrorMessageTimerForTesting() { return error_message_timer_; } diff --git a/chrome/browser/chromeos/login/screens/update_screen.h b/chrome/browser/chromeos/login/screens/update_screen.h index 44de547..cdc1d7a 100644 --- a/chrome/browser/chromeos/login/screens/update_screen.h +++ b/chrome/browser/chromeos/login/screens/update_screen.h @@ -77,7 +77,7 @@ class UpdateScreen : public UpdateModel, // Skip update UI, usually used only in debug builds/tests. void CancelUpdate(); - base::OneShotTimer<UpdateScreen>& GetErrorMessageTimerForTesting(); + base::OneShotTimer& GetErrorMessageTimerForTesting(); private: FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic); @@ -126,7 +126,7 @@ class UpdateScreen : public UpdateModel, // Timer for the interval to wait for the reboot. // If reboot didn't happen - ask user to reboot manually. - base::OneShotTimer<UpdateScreen> reboot_timer_; + base::OneShotTimer reboot_timer_; // Returns a static InstanceSet. typedef std::set<UpdateScreen*> InstanceSet; @@ -181,7 +181,7 @@ class UpdateScreen : public UpdateModel, // Timer for the captive portal detector to show portal login page. // If redirect did not happen during this delay, error message is shown // instead. - base::OneShotTimer<UpdateScreen> error_message_timer_; + base::OneShotTimer error_message_timer_; ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_; diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h index 7b9c684..54fdd68 100644 --- a/chrome/browser/chromeos/login/screens/user_selection_screen.h +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h @@ -141,7 +141,7 @@ class UserSelectionScreen user_auth_type_map_; // Timer for measuring idle state duration before password clear. - base::OneShotTimer<UserSelectionScreen> password_clear_timer_; + base::OneShotTimer password_clear_timer_; // Token handler util for checking user OAuth token status. scoped_ptr<TokenHandleUtil> token_handle_util_; diff --git a/chrome/browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h b/chrome/browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h index 5d1c0c2..b8cdd8b 100644 --- a/chrome/browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h +++ b/chrome/browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h @@ -50,7 +50,7 @@ class ScreenshotTestingMixin : public MixinBasedBrowserTest::Mixin { // Required for current implementation of // SynchronizeAnimationLoadWithCompositor() - base::OneShotTimer<ScreenshotTestingMixin> timer_; + base::OneShotTimer timer_; base::Closure animation_waiter_quitter_; // Is true if testing with screenshots is turned on with all proper switches. diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h index 6e0c6ac..597fab0 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h @@ -179,7 +179,7 @@ class SupervisedUserCreationControllerNew scoped_ptr<UserCreationContext> creation_context_; // Timer for showing warning if creation process takes too long. - base::OneShotTimer<SupervisedUserCreationControllerNew> timeout_timer_; + base::OneShotTimer timeout_timer_; // Factory of callbacks. base::WeakPtrFactory<SupervisedUserCreationControllerNew> weak_factory_; diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h index 8a0875f..5b42bcc 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h @@ -199,11 +199,11 @@ class UserImageManagerImpl // Timer used to start a profile data download shortly after login and to // restart the download after network errors. - base::OneShotTimer<UserImageManagerImpl> profile_download_one_shot_timer_; + base::OneShotTimer profile_download_one_shot_timer_; // Timer used to periodically start a profile data, ensuring the profile data // stays up to date. - base::RepeatingTimer<UserImageManagerImpl> profile_download_periodic_timer_; + base::RepeatingTimer profile_download_periodic_timer_; // Sync observer for the currently logged-in user. scoped_ptr<UserImageSyncObserver> user_image_sync_observer_; diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc index c62a490..8a58aba 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc @@ -265,7 +265,7 @@ class WallpaperManager::PendingWallpaper : // This is "on destroy" callback that will call OnWallpaperSet() when // image will be loaded. wallpaper::MovableOnDestroyCallbackHolder on_finish_; - base::OneShotTimer<WallpaperManager::PendingWallpaper> timer; + base::OneShotTimer timer; // Load start time to calculate duration. base::Time started_load_at_; diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h index 2a84f43..eaae940 100644 --- a/chrome/browser/chromeos/login/wizard_controller.h +++ b/chrome/browser/chromeos/login/wizard_controller.h @@ -353,7 +353,7 @@ class WizardController : public BaseScreenDelegate, // Default WizardController. static WizardController* default_controller_; - base::OneShotTimer<WizardController> smooth_show_timer_; + base::OneShotTimer smooth_show_timer_; OobeDisplay* oobe_display_; diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h index 2c51419..ae80d11 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.h +++ b/chrome/browser/chromeos/mobile/mobile_activator.h @@ -307,14 +307,14 @@ class MobileActivator // Payment portal reload/reconnect attempt count. int payment_reconnect_count_; // Timer that monitors how long we spend in error-prone states. - base::RepeatingTimer<MobileActivator> state_duration_timer_; + base::RepeatingTimer state_duration_timer_; // State we will return to if we are disconnected. PlanActivationState post_reconnect_state_; // Called to continue the reconnect attempt. - base::RepeatingTimer<MobileActivator> continue_reconnect_timer_; + base::RepeatingTimer continue_reconnect_timer_; // Called when the reconnect attempt times out. - base::OneShotTimer<MobileActivator> reconnect_timeout_timer_; + base::OneShotTimer reconnect_timeout_timer_; // Cellular plan payment time. base::Time cellular_plan_payment_time_; diff --git a/chrome/browser/chromeos/policy/device_status_collector.h b/chrome/browser/chromeos/policy/device_status_collector.h index bc10701..c0c97d8 100644 --- a/chrome/browser/chromeos/policy/device_status_collector.h +++ b/chrome/browser/chromeos/policy/device_status_collector.h @@ -215,9 +215,9 @@ class DeviceStatusCollector { // Whether a geolocation update is currently in progress. bool geolocation_update_in_progress_; - base::RepeatingTimer<DeviceStatusCollector> idle_poll_timer_; - base::RepeatingTimer<DeviceStatusCollector> hardware_status_sampling_timer_; - base::OneShotTimer<DeviceStatusCollector> geolocation_update_timer_; + base::RepeatingTimer idle_poll_timer_; + base::RepeatingTimer hardware_status_sampling_timer_; + base::OneShotTimer geolocation_update_timer_; std::string os_version_; std::string firmware_version_; diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h index 7063754..d357794 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer.h @@ -64,7 +64,7 @@ class RecommendationRestorer : public KeyedService, bool logged_in_; - base::OneShotTimer<RecommendationRestorer> restore_timer_; + base::OneShotTimer restore_timer_; DISALLOW_COPY_AND_ASSIGN(RecommendationRestorer); }; diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_reboot_job.h b/chrome/browser/chromeos/policy/remote_commands/device_command_reboot_job.h index 711ec3d..a3b78dc 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_reboot_job.h +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_reboot_job.h @@ -39,7 +39,7 @@ class DeviceCommandRebootJob : public RemoteCommandJob { chromeos::PowerManagerClient* power_manager_client_; - base::OneShotTimer<DeviceCommandRebootJob> reboot_timer_; + base::OneShotTimer reboot_timer_; base::WeakPtrFactory<DeviceCommandRebootJob> weak_ptr_factory_; diff --git a/chrome/browser/chromeos/power/cpu_data_collector.h b/chrome/browser/chromeos/power/cpu_data_collector.h index d0734c6..59ad804 100644 --- a/chrome/browser/chromeos/power/cpu_data_collector.h +++ b/chrome/browser/chromeos/power/cpu_data_collector.h @@ -84,7 +84,7 @@ class CpuDataCollector { const std::vector<std::string>* cpu_freq_state_names, const std::vector<StateOccupancySample>* freq_samples); - base::RepeatingTimer<CpuDataCollector> timer_; + base::RepeatingTimer timer_; // Names of the idle states. std::vector<std::string> cpu_idle_state_names_; diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h index 793a057..52e2daf 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h +++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h @@ -42,7 +42,7 @@ class IdleActionWarningDialogView : public views::DialogDelegateView { views::Label* label_; - base::RepeatingTimer<IdleActionWarningDialogView> update_timer_; + base::RepeatingTimer update_timer_; DISALLOW_COPY_AND_ASSIGN(IdleActionWarningDialogView); }; diff --git a/chrome/browser/chromeos/session_length_limiter.cc b/chrome/browser/chromeos/session_length_limiter.cc index f26cf448..7bc17ad 100644 --- a/chrome/browser/chromeos/session_length_limiter.cc +++ b/chrome/browser/chromeos/session_length_limiter.cc @@ -204,7 +204,7 @@ void SessionLengthLimiter::UpdateLimit() { } // Set a timer to log out the user when the session length limit is reached. - timer_.reset(new base::OneShotTimer<SessionLengthLimiter::Delegate>); + timer_.reset(new base::OneShotTimer); timer_->Start(FROM_HERE, remaining, delegate_.get(), &SessionLengthLimiter::Delegate::StopSession); } diff --git a/chrome/browser/chromeos/session_length_limiter.h b/chrome/browser/chromeos/session_length_limiter.h index 16c34f8..46a2765 100644 --- a/chrome/browser/chromeos/session_length_limiter.h +++ b/chrome/browser/chromeos/session_length_limiter.h @@ -63,7 +63,7 @@ class SessionLengthLimiter : public ui::UserActivityObserver { scoped_ptr<Delegate> delegate_; PrefChangeRegistrar pref_change_registrar_; - scoped_ptr<base::OneShotTimer<SessionLengthLimiter::Delegate> > timer_; + scoped_ptr<base::OneShotTimer> timer_; base::TimeTicks session_start_time_; bool user_activity_seen_; diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc index a15e3a7..050b767 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc @@ -178,8 +178,7 @@ AutomaticRebootManager::AutomaticRebootManager( ui::UserActivityDetector::Get()->AddObserver(this); notification_registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED, content::NotificationService::AllSources()); - login_screen_idle_timer_.reset( - new base::OneShotTimer<AutomaticRebootManager>); + login_screen_idle_timer_.reset(new base::OneShotTimer); OnUserActivity(NULL); } @@ -252,8 +251,7 @@ void AutomaticRebootManager::OnUserActivity(const ui::Event* event) { // Destroying and re-creating the timer ensures that Start() posts a fresh // task with a delay of exactly |kLoginManagerIdleTimeoutMs|, ensuring that // the timer fires predictably in tests. - login_screen_idle_timer_.reset( - new base::OneShotTimer<AutomaticRebootManager>); + login_screen_idle_timer_.reset(new base::OneShotTimer); login_screen_idle_timer_->Start( FROM_HERE, base::TimeDelta::FromMilliseconds(kLoginManagerIdleTimeoutMs), @@ -363,7 +361,7 @@ void AutomaticRebootManager::Reschedule() { // Set up a timer for the start of the grace period. If the grace period // started in the past, the timer is still used with its delay set to zero. if (!grace_start_timer_) - grace_start_timer_.reset(new base::OneShotTimer<AutomaticRebootManager>); + grace_start_timer_.reset(new base::OneShotTimer); grace_start_timer_->Start(FROM_HERE, std::max(grace_start_time - now, kZeroTimeDelta), base::Bind(&AutomaticRebootManager::RequestReboot, @@ -374,7 +372,7 @@ void AutomaticRebootManager::Reschedule() { // Set up a timer for the end of the grace period. If the grace period ended // in the past, the timer is still used with its delay set to zero. if (!grace_end_timer_) - grace_end_timer_.reset(new base::OneShotTimer<AutomaticRebootManager>); + grace_end_timer_.reset(new base::OneShotTimer); grace_end_timer_->Start(FROM_HERE, std::max(grace_end_time - now, kZeroTimeDelta), base::Bind(&AutomaticRebootManager::Reboot, diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h index 2dbc98e..6f03913 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.h +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h @@ -148,8 +148,7 @@ class AutomaticRebootManager : public PowerManagerClient::Observer, // Fires when the user has been idle on the login screen for a set amount of // time. - scoped_ptr<base::OneShotTimer<AutomaticRebootManager> > - login_screen_idle_timer_; + scoped_ptr<base::OneShotTimer> login_screen_idle_timer_; // The time at which the device was booted, in |clock_| ticks. bool have_boot_time_; @@ -167,8 +166,8 @@ class AutomaticRebootManager : public PowerManagerClient::Observer, bool reboot_requested_; // Timers that start and end the grace period. - scoped_ptr<base::OneShotTimer<AutomaticRebootManager> > grace_start_timer_; - scoped_ptr<base::OneShotTimer<AutomaticRebootManager> > grace_end_timer_; + scoped_ptr<base::OneShotTimer> grace_start_timer_; + scoped_ptr<base::OneShotTimer> grace_end_timer_; base::ObserverList<AutomaticRebootManagerObserver, true> observers_; diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc index a6ac983..3fe61fb 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc @@ -134,8 +134,6 @@ class MockAutomaticRebootManagerObserver class AutomaticRebootManagerBasicTest : public testing::Test { protected: - typedef base::OneShotTimer<AutomaticRebootManager> Timer; - AutomaticRebootManagerBasicTest(); ~AutomaticRebootManagerBasicTest() override; @@ -190,8 +188,8 @@ class AutomaticRebootManagerBasicTest : public testing::Test { scoped_ptr<AutomaticRebootManager> automatic_reboot_manager_; private: - void VerifyTimerIsStopped(const Timer* timer) const; - void VerifyTimerIsRunning(const Timer* timer, + void VerifyTimerIsStopped(const base::OneShotTimer* timer) const; + void VerifyTimerIsRunning(const base::OneShotTimer* timer, const base::TimeDelta& delay) const; void VerifyLoginScreenIdleTimerIsRunning() const; @@ -542,13 +540,13 @@ void AutomaticRebootManagerBasicTest::SetUpdateStatusNeedReboot() { } void AutomaticRebootManagerBasicTest::VerifyTimerIsStopped( - const Timer* timer) const { + const base::OneShotTimer* timer) const { if (timer) EXPECT_FALSE(timer->IsRunning()); } void AutomaticRebootManagerBasicTest::VerifyTimerIsRunning( - const Timer* timer, + const base::OneShotTimer* timer, const base::TimeDelta& delay) const { ASSERT_TRUE(timer); EXPECT_TRUE(timer->IsRunning()); diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc index 73b8f65..c9114f0 100644 --- a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc +++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc @@ -199,7 +199,7 @@ class IdleAppNameNotificationDelegateView } // A timer which calls us to remove the message from the screen. - base::OneShotTimer<IdleAppNameNotificationDelegateView> hide_timer_; + base::OneShotTimer hide_timer_; // The owner of this message which needs to get notified when the message // closes. diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h index 467c15b..d92b4d9 100644 --- a/chrome/browser/chromeos/upgrade_detector_chromeos.h +++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h @@ -51,7 +51,7 @@ class UpgradeDetectorChromeos : public UpgradeDetector, // After we detect an upgrade we start a recurring timer to see if enough time // has passed and we should start notifying the user. - base::RepeatingTimer<UpgradeDetectorChromeos> upgrade_notification_timer_; + base::RepeatingTimer upgrade_notification_timer_; bool initialized_; base::Time upgrade_detected_time_; diff --git a/chrome/browser/devtools/devtools_network_interceptor.h b/chrome/browser/devtools/devtools_network_interceptor.h index 971f585..01ba377 100644 --- a/chrome/browser/devtools/devtools_network_interceptor.h +++ b/chrome/browser/devtools/devtools_network_interceptor.h @@ -67,7 +67,7 @@ class DevToolsNetworkInterceptor { // Transactions waiting certain amount of transfer to be "accounted". std::vector<DevToolsNetworkTransaction*> throttled_transactions_; - base::OneShotTimer<DevToolsNetworkInterceptor> timer_; + base::OneShotTimer timer_; base::TimeTicks offset_; base::TimeDelta tick_length_; base::TimeDelta latency_length_; diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h index b8920e6..adca0fb 100644 --- a/chrome/browser/enumerate_modules_model_win.h +++ b/chrome/browser/enumerate_modules_model_win.h @@ -333,7 +333,7 @@ class EnumerateModulesModel { // When this singleton object is constructed we go and fire off this timer to // start scanning for modules after a certain amount of time has passed. - base::OneShotTimer<EnumerateModulesModel> check_modules_timer_; + base::OneShotTimer check_modules_timer_; // While normally |false|, this mode can be set to indicate that the scanning // process should not rely on certain services normally available to Chrome, diff --git a/chrome/browser/extensions/activity_log/activity_database.h b/chrome/browser/extensions/activity_log/activity_database.h index 9479f0d..2011f0f 100644 --- a/chrome/browser/extensions/activity_log/activity_database.h +++ b/chrome/browser/extensions/activity_log/activity_database.h @@ -188,7 +188,7 @@ class ActivityDatabase { bool valid_db_; bool batch_mode_; base::TimeDelta batching_period_; - base::RepeatingTimer<ActivityDatabase> timer_; + base::RepeatingTimer timer_; bool already_closed_; bool did_init_; diff --git a/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc b/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc index 572979c..290544f 100644 --- a/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc +++ b/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc @@ -178,7 +178,7 @@ void AudioModemAPI::StartReceive(const std::string& app_id, modem_->StartRecording(audio_type); if (receive_timers_[audio_type].count(app_id) == 0) - receive_timers_[audio_type][app_id] = new base::OneShotTimer<AudioModemAPI>; + receive_timers_[audio_type][app_id] = new base::OneShotTimer; DCHECK(receive_timers_[audio_type][app_id]); receive_timers_[audio_type][app_id]->Start( FROM_HERE, diff --git a/chrome/browser/extensions/api/audio_modem/audio_modem_api.h b/chrome/browser/extensions/api/audio_modem/audio_modem_api.h index dcccbfe..77034b5 100644 --- a/chrome/browser/extensions/api/audio_modem/audio_modem_api.h +++ b/chrome/browser/extensions/api/audio_modem/audio_modem_api.h @@ -73,11 +73,11 @@ class AudioModemAPI final : public BrowserContextKeyedAPI { std::string transmitters_[2]; // Timeouts for the currently active transmits, indexed by AudioType. - base::OneShotTimer<AudioModemAPI> transmit_timers_[2]; + base::OneShotTimer transmit_timers_[2]; // Maps of currently receiving app ID => timeouts. Indexed by AudioType. // We own all of these pointers. Do not remove them without calling delete. - std::map<std::string, base::OneShotTimer<AudioModemAPI>*> receive_timers_[2]; + std::map<std::string, base::OneShotTimer*> receive_timers_[2]; // BrowserContextKeyedAPI implementation. static const bool kServiceIsCreatedWithBrowserContext = false; diff --git a/chrome/browser/extensions/api/dial/dial_registry.h b/chrome/browser/extensions/api/dial/dial_registry.h index 83caa38..613fcd4 100644 --- a/chrome/browser/extensions/api/dial/dial_registry.h +++ b/chrome/browser/extensions/api/dial/dial_registry.h @@ -166,7 +166,7 @@ class DialRegistry : public DialService::Observer, DeviceByLabelMap device_by_label_map_; // Timer used to manage periodic discovery requests. - base::RepeatingTimer<DialRegistry> repeating_timer_; + base::RepeatingTimer repeating_timer_; // Interface from which the DIAL API is notified of DIAL device events. the // DIAL API owns this DIAL registry. diff --git a/chrome/browser/extensions/api/dial/dial_service.h b/chrome/browser/extensions/api/dial/dial_service.h index 23ef579..6f1e7e9 100644 --- a/chrome/browser/extensions/api/dial/dial_service.h +++ b/chrome/browser/extensions/api/dial/dial_service.h @@ -268,14 +268,14 @@ class DialServiceImpl : public DialService, int max_requests_; // Timer for finishing discovery. - base::OneShotTimer<DialServiceImpl> finish_timer_; + base::OneShotTimer finish_timer_; // The delay for |finish_timer_|; how long to wait for discovery to finish. // Setting this to zero disables the timer. base::TimeDelta finish_delay_; // Timer for sending multiple requests at fixed intervals. - base::RepeatingTimer<DialServiceImpl> request_timer_; + base::RepeatingTimer request_timer_; // The delay for |request_timer_|; how long to wait between successive // requests. diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc index 6fde8c4..2b92734 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc @@ -1077,8 +1077,7 @@ bool EasyUnlockPrivateFindSetupConnectionFunction::RunAsync() { connection_finder_->Find(base::Bind( &EasyUnlockPrivateFindSetupConnectionFunction::OnConnectionFound, this)); - timer_.reset( - new base::OneShotTimer<EasyUnlockPrivateFindSetupConnectionFunction>()); + timer_.reset(new base::OneShotTimer()); timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(params->time_out), base::Bind(&EasyUnlockPrivateFindSetupConnectionFunction:: OnConnectionFinderTimedOut, diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index e2999bb..75dd877 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h @@ -254,7 +254,7 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate, // Fetches the crx files for the extensions that have an available update. scoped_ptr<ExtensionDownloader> downloader_; - base::OneShotTimer<ExtensionUpdater> timer_; + base::OneShotTimer timer_; int frequency_seconds_; bool will_check_soon_; diff --git a/chrome/browser/extensions/webstore_installer.h b/chrome/browser/extensions/webstore_installer.h index 58e76fa..4bddaf5 100644 --- a/chrome/browser/extensions/webstore_installer.h +++ b/chrome/browser/extensions/webstore_installer.h @@ -276,7 +276,7 @@ class WebstoreInstaller : public content::NotificationObserver, // Used to periodically update the extension's download status. This will // trigger at least every second, though sometimes more frequently (depending // on number of modules, etc). - base::OneShotTimer<WebstoreInstaller> download_progress_timer_; + base::OneShotTimer download_progress_timer_; scoped_ptr<Approval> approval_; GURL download_url_; scoped_refptr<CrxInstaller> crx_installer_; diff --git a/chrome/browser/image_decoder.cc b/chrome/browser/image_decoder.cc index 7d26e80..bd5ec1eb 100644 --- a/chrome/browser/image_decoder.cc +++ b/chrome/browser/image_decoder.cc @@ -125,10 +125,8 @@ void ImageDecoder::DecodeImageInSandbox( if (!batch_mode_timer_) { // Created here so it will call StopBatchMode() on the right thread. - batch_mode_timer_.reset(new base::DelayTimer<ImageDecoder>( - FROM_HERE, - base::TimeDelta::FromSeconds(kBatchModeTimeoutSeconds), - this, + batch_mode_timer_.reset(new base::DelayTimer( + FROM_HERE, base::TimeDelta::FromSeconds(kBatchModeTimeoutSeconds), this, &ImageDecoder::StopBatchMode)); } batch_mode_timer_->Reset(); diff --git a/chrome/browser/image_decoder.h b/chrome/browser/image_decoder.h index 9e0b3ed..13d903d 100644 --- a/chrome/browser/image_decoder.h +++ b/chrome/browser/image_decoder.h @@ -150,7 +150,7 @@ class ImageDecoder : public content::UtilityProcessHostClient { // Calls StopBatchMode() after |kBatchModeTimeoutSeconds| have elapsed, // unless a new decoding request resets the timer. - scoped_ptr<base::DelayTimer<ImageDecoder>> batch_mode_timer_; + scoped_ptr<base::DelayTimer> batch_mode_timer_; DISALLOW_COPY_AND_ASSIGN(ImageDecoder); }; diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h index 28f751c..5033d270 100644 --- a/chrome/browser/jumplist_win.h +++ b/chrome/browser/jumplist_win.h @@ -170,7 +170,7 @@ class JumpList : public sessions::TabRestoreServiceObserver, ShellLinkItemList recently_closed_pages_; // Timer for requesting delayed updates of the jumplist. - base::OneShotTimer<JumpList> timer_; + base::OneShotTimer timer_; // A list of URLs we need to retrieve their favicons, // protected by the list_lock_. diff --git a/chrome/browser/media/android/remote/remote_media_player_bridge.h b/chrome/browser/media/android/remote/remote_media_player_bridge.h index f1f506c..ce36079 100644 --- a/chrome/browser/media/android/remote/remote_media_player_bridge.h +++ b/chrome/browser/media/android/remote/remote_media_player_bridge.h @@ -117,7 +117,7 @@ class RemoteMediaPlayerBridge : public media::MediaPlayerAndroid { bool pending_play_; int width_; int height_; - base::RepeatingTimer<RemoteMediaPlayerBridge> time_update_timer_; + base::RepeatingTimer time_update_timer_; base::TimeDelta duration_; bool should_seek_on_prepare_; base::TimeDelta pending_seek_; diff --git a/chrome/browser/memory/oom_priority_manager.h b/chrome/browser/memory/oom_priority_manager.h index 1b50a33..5a13d2b 100644 --- a/chrome/browser/memory/oom_priority_manager.h +++ b/chrome/browser/memory/oom_priority_manager.h @@ -129,11 +129,11 @@ class OomPriorityManager { static bool CompareTabStats(TabStats first, TabStats second); // Timer to periodically update the stats of the renderers. - base::RepeatingTimer<OomPriorityManager> update_timer_; + base::RepeatingTimer update_timer_; // Timer to periodically report whether a tab has been discarded since the // last time the timer has fired. - base::RepeatingTimer<OomPriorityManager> recent_tab_discard_timer_; + base::RepeatingTimer recent_tab_discard_timer_; // A listener to global memory pressure events. scoped_ptr<base::MemoryPressureListener> memory_pressure_listener_; diff --git a/chrome/browser/memory/oom_priority_manager_delegate_chromeos.h b/chrome/browser/memory/oom_priority_manager_delegate_chromeos.h index a9824b4..b8ce1fc 100644 --- a/chrome/browser/memory/oom_priority_manager_delegate_chromeos.h +++ b/chrome/browser/memory/oom_priority_manager_delegate_chromeos.h @@ -65,7 +65,7 @@ class OomPriorityManagerDelegate : public content::NotificationObserver { // Registrar to receive renderer notifications. content::NotificationRegistrar registrar_; // Timer to guarantee that the tab is focused for a certain amount of time. - base::OneShotTimer<OomPriorityManagerDelegate> focus_tab_score_adjust_timer_; + base::OneShotTimer focus_tab_score_adjust_timer_; // This lock is for |oom_score_map_| and |focused_tab_process_info_|. base::Lock oom_score_lock_; // Map maintaining the child process host id - oom_score mapping. diff --git a/chrome/browser/metrics/perf/perf_provider_chromeos.h b/chrome/browser/metrics/perf/perf_provider_chromeos.h index 147d09c..64b28d2 100644 --- a/chrome/browser/metrics/perf/perf_provider_chromeos.h +++ b/chrome/browser/metrics/perf/perf_provider_chromeos.h @@ -115,7 +115,7 @@ class PerfProvider : public base::NonThreadSafe, std::vector<SampledProfile> cached_perf_data_; // For scheduling collection of perf data. - base::OneShotTimer<PerfProvider> timer_; + base::OneShotTimer timer_; // For detecting when changes to the login state. LoginObserver login_observer_; diff --git a/chrome/browser/metrics/variations/variations_registry_syncer_win.h b/chrome/browser/metrics/variations/variations_registry_syncer_win.h index 32487c4..11dc3ab 100644 --- a/chrome/browser/metrics/variations/variations_registry_syncer_win.h +++ b/chrome/browser/metrics/variations/variations_registry_syncer_win.h @@ -31,7 +31,7 @@ class VariationsRegistrySyncer { // after initial batch of field trials are created, and also to avoid blocking // the UI thread. The timer effectively allows this class to batch together // update requests, to avoid reading and writing from the registry too much. - base::OneShotTimer<VariationsRegistrySyncer> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(VariationsRegistrySyncer); }; diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 8a2d9d0..132f95c 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -39,17 +39,16 @@ namespace chrome_browser_net { class WaitForResolutionHelper; -typedef base::RepeatingTimer<WaitForResolutionHelper> HelperTimer; - class WaitForResolutionHelper { public: - WaitForResolutionHelper(Predictor* predictor, const UrlList& hosts, - HelperTimer* timer, int checks_until_quit) + WaitForResolutionHelper(Predictor* predictor, + const UrlList& hosts, + base::RepeatingTimer* timer, + int checks_until_quit) : predictor_(predictor), hosts_(hosts), timer_(timer), - checks_until_quit_(checks_until_quit) { - } + checks_until_quit_(checks_until_quit) {} void CheckIfResolutionsDone() { if (--checks_until_quit_ > 0) { @@ -70,7 +69,7 @@ class WaitForResolutionHelper { private: Predictor* predictor_; const UrlList hosts_; - HelperTimer* timer_; + base::RepeatingTimer* timer_; int checks_until_quit_; }; @@ -102,7 +101,7 @@ class PredictorTest : public testing::Test { } void WaitForResolution(Predictor* predictor, const UrlList& hosts) { - HelperTimer* timer = new HelperTimer(); + base::RepeatingTimer* timer = new base::RepeatingTimer(); // By default allow the loop to run for a minute -- 600 iterations. timer->Start(FROM_HERE, TimeDelta::FromMilliseconds(100), new WaitForResolutionHelper(predictor, hosts, timer, 600), @@ -112,7 +111,7 @@ class PredictorTest : public testing::Test { void WaitForResolutionWithLimit( Predictor* predictor, const UrlList& hosts, int limit) { - HelperTimer* timer = new HelperTimer(); + base::RepeatingTimer* timer = new base::RepeatingTimer(); timer->Start(FROM_HERE, TimeDelta::FromMilliseconds(100), new WaitForResolutionHelper(predictor, hosts, timer, limit), &WaitForResolutionHelper::CheckIfResolutionsDone); diff --git a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h index 6bbc1ca..a14f652 100644 --- a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h +++ b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h @@ -59,7 +59,7 @@ class UtilityProcessMojoProxyResolverFactory base::WeakPtr<content::UtilityProcessHost> weak_utility_process_host_; size_t num_proxy_resolvers_ = 0; - base::OneShotTimer<UtilityProcessMojoProxyResolverFactory> idle_timer_; + base::OneShotTimer idle_timer_; base::ThreadChecker thread_checker_; diff --git a/chrome/browser/notifications/extension_welcome_notification.cc b/chrome/browser/notifications/extension_welcome_notification.cc index 383107f..b34bf3d 100644 --- a/chrome/browser/notifications/extension_welcome_notification.cc +++ b/chrome/browser/notifications/extension_welcome_notification.cc @@ -308,8 +308,7 @@ void ExtensionWelcomeNotification::StartExpirationTimer() { expiration_timestamp = GetExpirationTimestamp(); DCHECK(!expiration_timestamp.is_null()); } - expiration_timer_.reset( - new base::OneShotTimer<ExtensionWelcomeNotification>()); + expiration_timer_.reset(new base::OneShotTimer()); expiration_timer_->Start( FROM_HERE, expiration_timestamp - delegate_->GetCurrentTime(), diff --git a/chrome/browser/notifications/extension_welcome_notification.h b/chrome/browser/notifications/extension_welcome_notification.h index 728a1b9..3e26c50 100644 --- a/chrome/browser/notifications/extension_welcome_notification.h +++ b/chrome/browser/notifications/extension_welcome_notification.h @@ -152,8 +152,7 @@ class ExtensionWelcomeNotification // If the welcome notification is shown, this timer tracks when to hide the // welcome notification. - scoped_ptr<base::OneShotTimer<ExtensionWelcomeNotification> > - expiration_timer_; + scoped_ptr<base::OneShotTimer> expiration_timer_; // Delegate for Chrome global calls like base::Time::GetTime() for // testability. diff --git a/chrome/browser/notifications/screen_lock_notification_blocker.h b/chrome/browser/notifications/screen_lock_notification_blocker.h index 698ba28..4aff911 100644 --- a/chrome/browser/notifications/screen_lock_notification_blocker.h +++ b/chrome/browser/notifications/screen_lock_notification_blocker.h @@ -28,7 +28,7 @@ class ScreenLockNotificationBlocker private: bool is_locked_; - base::OneShotTimer<ScreenLockNotificationBlocker> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(ScreenLockNotificationBlocker); }; diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h index 7e1b20f..d06af4d 100644 --- a/chrome/browser/performance_monitor/performance_monitor.h +++ b/chrome/browser/performance_monitor/performance_monitor.h @@ -67,7 +67,7 @@ class PerformanceMonitor { MetricsMap metrics_map_; // The timer to signal PerformanceMonitor to perform its timed collections. - base::OneShotTimer<PerformanceMonitor> repeating_timer_; + base::OneShotTimer repeating_timer_; DISALLOW_COPY_AND_ASSIGN(PerformanceMonitor); }; diff --git a/chrome/browser/power/process_power_collector.h b/chrome/browser/power/process_power_collector.h index 7976e83..533a575 100644 --- a/chrome/browser/power/process_power_collector.h +++ b/chrome/browser/power/process_power_collector.h @@ -135,7 +135,7 @@ class ProcessPowerCollector const GURL& origin); ProcessMetricsMap metrics_map_; - base::RepeatingTimer<ProcessPowerCollector> timer_; + base::RepeatingTimer timer_; // Callback to use to get CPU usage if set. CpuUsageCallback cpu_usage_callback_; diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index 2ba76b4..8969e19 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -509,7 +509,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, // RepeatingTimer to perform periodic cleanups of pending prerendered // pages. - base::RepeatingTimer<PrerenderManager> repeating_timer_; + base::RepeatingTimer repeating_timer_; // Track time of last prerender to limit prerender spam. base::TimeTicks last_prerender_start_time_; diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index 8ca2486d..6515b03 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -450,7 +450,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() { // be CPU bound, the page overly complex/large or the system just // memory-bound. static const int kPrinterSettingsTimeout = 60000; - base::OneShotTimer<base::MessageLoop> quit_timer; + base::OneShotTimer quit_timer; quit_timer.Start(FROM_HERE, TimeDelta::FromMilliseconds(kPrinterSettingsTimeout), base::MessageLoop::current(), &base::MessageLoop::Quit); diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc index 5e2635e..81a5c5f 100644 --- a/chrome/browser/process_singleton_posix.cc +++ b/chrome/browser/process_singleton_posix.cc @@ -516,7 +516,7 @@ class ProcessSingleton::LinuxWatcher // reads. size_t bytes_read_; - base::OneShotTimer<SocketReader> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(SocketReader); }; diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.h b/chrome/browser/profile_resetter/brandcode_config_fetcher.h index 4495454..d0bc537 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.h +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.h @@ -41,7 +41,7 @@ class BrandcodeConfigFetcher : public net::URLFetcherDelegate { // Timer that enforces a timeout on the attempt to download the // config file. - base::OneShotTimer<BrandcodeConfigFetcher> download_timer_; + base::OneShotTimer download_timer_; // |fetch_callback_| called when fetching succeeded or failed. FetchCallback fetch_callback_; diff --git a/chrome/browser/profiles/gaia_info_update_service.h b/chrome/browser/profiles/gaia_info_update_service.h index c2f77cc..17cab93 100644 --- a/chrome/browser/profiles/gaia_info_update_service.h +++ b/chrome/browser/profiles/gaia_info_update_service.h @@ -62,7 +62,7 @@ class GAIAInfoUpdateService : public KeyedService, Profile* profile_; scoped_ptr<ProfileDownloader> profile_image_downloader_; base::Time last_updated_; - base::OneShotTimer<GAIAInfoUpdateService> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(GAIAInfoUpdateService); }; diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 8bbf7e1..89b98ab 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -243,7 +243,7 @@ class ProfileImpl : public Profile { ExitType last_session_exit_type_; #if defined(ENABLE_SESSION_SERVICE) - base::OneShotTimer<ProfileImpl> create_session_service_timer_; + base::OneShotTimer create_session_service_timer_; #endif scoped_ptr<Profile> off_the_record_profile_; diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.h b/chrome/browser/renderer_context_menu/spelling_menu_observer.h index a29965d..adfead7 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer.h +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.h @@ -59,8 +59,8 @@ class SpellingMenuObserver : public RenderViewContextMenuObserver { const std::vector<SpellCheckResult>& results); private: - // The callback function for base::RepeatingTimer<SpellingMenuClient>. This - // function updates the "loading..." animation in the context-menu item. + // The callback function for base::RepeatingTimer. This function updates the + // "loading..." animation in the context-menu item. void OnAnimationTimerExpired(); // The interface to add a context-menu item and update it. This class uses @@ -104,7 +104,7 @@ class SpellingMenuObserver : public RenderViewContextMenuObserver { scoped_ptr<SpellingServiceClient> client_; // A timer used for loading animation. - base::RepeatingTimer<SpellingMenuObserver> animation_timer_; + base::RepeatingTimer animation_timer_; // Flag indicating whether online spelling correction service is enabled. When // this variable is true and we right-click a misspelled word, we send a diff --git a/chrome/browser/renderer_host/safe_browsing_resource_throttle.h b/chrome/browser/renderer_host/safe_browsing_resource_throttle.h index a7b5d2f..14c6ac9 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_throttle.h +++ b/chrome/browser/renderer_host/safe_browsing_resource_throttle.h @@ -164,7 +164,7 @@ class SafeBrowsingResourceThrottle base::TimeTicks defer_start_time_; // Timer to abort the safe browsing check if it takes too long. - base::OneShotTimer<SafeBrowsingResourceThrottle> timer_; + base::OneShotTimer timer_; // The redirect chain for this resource std::vector<GURL> redirect_urls_; diff --git a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h index 3bea1a4..19e3f6c 100644 --- a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h +++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h @@ -56,7 +56,7 @@ class DelayedCallbackRunner { CallbackList::iterator next_callback_; // A timer upon the firing of which the next callback will be run. - base::DelayTimer<DelayedCallbackRunner> timer_; + base::DelayTimer timer_; DISALLOW_COPY_AND_ASSIGN(DelayedCallbackRunner); }; diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h index e638da6..4c6e5fa 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h @@ -285,7 +285,7 @@ class IncidentReportingService : public content::NotificationObserver { // A timer upon the firing of which the service will report received // incidents. - base::DelayTimer<IncidentReportingService> collation_timer_; + base::DelayTimer collation_timer_; // The report currently being assembled. This becomes non-NULL when an initial // incident is reported, and returns to NULL when the report is sent for diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index bb6857ec..e8bb43f 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -321,11 +321,11 @@ class SafeBrowsingProtocolManager : public net::URLFetcherDelegate, // For managing the next earliest time to query the SafeBrowsing servers for // updates. base::TimeDelta next_update_interval_; - base::OneShotTimer<SafeBrowsingProtocolManager> update_timer_; + base::OneShotTimer update_timer_; // timeout_timer_ is used to interrupt update requests which are taking // too long. - base::OneShotTimer<SafeBrowsingProtocolManager> timeout_timer_; + base::OneShotTimer timeout_timer_; // All chunk requests that need to be made. std::deque<ChunkUrl> chunk_request_urls_; diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 807a2c2..9e0d347 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -486,7 +486,7 @@ class SafeBrowsingServerTestHelper return response_status_; } - base::OneShotTimer<SafeBrowsingServerTestHelper> check_update_timer_; + base::OneShotTimer check_update_timer_; SafeBrowsingServerTest* safe_browsing_test_; scoped_ptr<net::URLFetcher> url_fetcher_; std::string response_data_; diff --git a/chrome/browser/sessions/tab_loader.h b/chrome/browser/sessions/tab_loader.h index d21bd77..11c7dbd 100644 --- a/chrome/browser/sessions/tab_loader.h +++ b/chrome/browser/sessions/tab_loader.h @@ -129,7 +129,7 @@ class TabLoader : public content::NotificationObserver, // The tabs we need to load. TabsToLoad tabs_to_load_; - base::OneShotTimer<TabLoader> force_load_timer_; + base::OneShotTimer force_load_timer_; // The time the restore process started. base::TimeTicks restore_started_; diff --git a/chrome/browser/signin/cross_device_promo.h b/chrome/browser/signin/cross_device_promo.h index 5b1f5c5..d577e4b 100644 --- a/chrome/browser/signin/cross_device_promo.h +++ b/chrome/browser/signin/cross_device_promo.h @@ -229,7 +229,7 @@ class CrossDevicePromo : public KeyedService, // Used to delay the check of device activity. See // OnFetchDeviceActivitySuccess() or MaybeBrowsingSessionStarted(), as well as // |delay_until_next_device_activity_fetch_|, for details. - base::OneShotTimer<CrossDevicePromo> device_activity_timer_; + base::OneShotTimer device_activity_timer_; DISALLOW_COPY_AND_ASSIGN(CrossDevicePromo); }; diff --git a/chrome/browser/spellchecker/feedback_sender.h b/chrome/browser/spellchecker/feedback_sender.h index 80b23dd..ec97558 100644 --- a/chrome/browser/spellchecker/feedback_sender.h +++ b/chrome/browser/spellchecker/feedback_sender.h @@ -162,7 +162,7 @@ class FeedbackSender : public base::SupportsWeakPtr<FeedbackSender>, // all of the renderers. The timer starts in StartFeedbackCollection() and // stops in StopFeedbackCollection(). The timer stops and abandons its tasks // on destruction. - base::RepeatingTimer<FeedbackSender> timer_; + base::RepeatingTimer timer_; // Feedback senders that need to stay alive for the duration of sending data. // If a sender is destroyed before it finishes, then sending feedback will be diff --git a/chrome/browser/spellchecker/spellcheck_host_metrics.h b/chrome/browser/spellchecker/spellcheck_host_metrics.h index 60e61d9..d28b09a 100644 --- a/chrome/browser/spellchecker/spellcheck_host_metrics.h +++ b/chrome/browser/spellchecker/spellcheck_host_metrics.h @@ -88,7 +88,7 @@ class SpellCheckHostMetrics { base::TimeTicks start_time_; // Set of checked words in the hashed form. base::hash_set<std::string> checked_word_hashes_; - base::RepeatingTimer<SpellCheckHostMetrics> recording_timer_; + base::RepeatingTimer recording_timer_; }; #endif // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_HOST_METRICS_H_ diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h index 30dfb4f..403b544 100644 --- a/chrome/browser/ssl/ssl_error_handler.h +++ b/chrome/browser/ssl/ssl_error_handler.h @@ -86,9 +86,7 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>, // check and fires a one shot timer to wait for a "captive portal detected" // result to arrive. void StartHandlingError(); - const base::OneShotTimer<SSLErrorHandler>& get_timer() const { - return timer_; - } + const base::OneShotTimer& get_timer() const { return timer_; } // These are virtual for tests: virtual void CheckForCaptivePortal(); @@ -136,7 +134,7 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>, Profile* const profile_; content::NotificationRegistrar registrar_; - base::OneShotTimer<SSLErrorHandler> timer_; + base::OneShotTimer timer_; scoped_ptr<CommonNameMismatchHandler> common_name_mismatch_handler_; diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.h b/chrome/browser/supervised_user/child_accounts/child_account_service.h index ddd8303..bb0d5aa 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service.h +++ b/chrome/browser/supervised_user/child_accounts/child_account_service.h @@ -96,7 +96,7 @@ class ChildAccountService : public KeyedService, scoped_ptr<FamilyInfoFetcher> family_fetcher_; // If fetching the family info fails, retry with exponential backoff. - base::OneShotTimer<ChildAccountService> family_fetch_timer_; + base::OneShotTimer family_fetch_timer_; net::BackoffEntry family_fetch_backoff_; // Callbacks to run when the user status becomes known. diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc index 1b165ea..9d6891ca 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc @@ -18,7 +18,6 @@ #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" -using base::OneShotTimer; using base::Thread; using base::TimeDelta; using content::BrowserThread; @@ -37,7 +36,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test { bool did_do_work() { return did_do_work_; } BrowserThreadModelWorker* worker() { return worker_.get(); } - OneShotTimer<SyncBrowserThreadModelWorkerTest>* timer() { return &timer_; } + base::OneShotTimer* timer() { return &timer_; } base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest>* factory() { return &weak_factory_; } @@ -89,7 +88,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test { private: bool did_do_work_; scoped_refptr<BrowserThreadModelWorker> worker_; - OneShotTimer<SyncBrowserThreadModelWorkerTest> timer_; + base::OneShotTimer timer_; content::TestBrowserThreadBundle thread_bundle_; diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc index 4f5cd45..8c527a6 100644 --- a/chrome/browser/sync/glue/sync_backend_host_core.cc +++ b/chrome/browser/sync/glue/sync_backend_host_core.cc @@ -760,7 +760,7 @@ void SyncBackendHostCore::StartSavingChanges() { return; DCHECK_EQ(base::MessageLoop::current(), sync_loop_); DCHECK(!save_changes_timer_.get()); - save_changes_timer_.reset(new base::RepeatingTimer<SyncBackendHostCore>()); + save_changes_timer_.reset(new base::RepeatingTimer()); save_changes_timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(kSaveChangesIntervalSeconds), this, &SyncBackendHostCore::SaveChanges); diff --git a/chrome/browser/sync/glue/sync_backend_host_core.h b/chrome/browser/sync/glue/sync_backend_host_core.h index 489f1af..2229eed 100644 --- a/chrome/browser/sync/glue/sync_backend_host_core.h +++ b/chrome/browser/sync/glue/sync_backend_host_core.h @@ -284,7 +284,7 @@ class SyncBackendHostCore SyncBackendRegistrar* registrar_; // The timer used to periodically call SaveChanges. - scoped_ptr<base::RepeatingTimer<SyncBackendHostCore> > save_changes_timer_; + scoped_ptr<base::RepeatingTimer> save_changes_timer_; // Our encryptor, which uses Chrome's encryption functions. sync_driver::SystemEncryptor encryptor_; diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index 04980df..f02217c 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -916,7 +916,7 @@ class ProfileSyncService : public sync_driver::SyncService, // If RequestAccessToken fails with transient error then retry requesting // access token with exponential backoff. - base::OneShotTimer<ProfileSyncService> request_access_token_retry_timer_; + base::OneShotTimer request_access_token_retry_timer_; net::BackoffEntry request_access_token_backoff_; // States related to sync token and connection. diff --git a/chrome/browser/sync/test/integration/status_change_checker.cc b/chrome/browser/sync/test/integration/status_change_checker.cc index 7ad6d6b8..4ebefa0 100644 --- a/chrome/browser/sync/test/integration/status_change_checker.cc +++ b/chrome/browser/sync/test/integration/status_change_checker.cc @@ -22,7 +22,7 @@ base::TimeDelta StatusChangeChecker::GetTimeoutDuration() { } void StatusChangeChecker::StartBlockingWait() { - base::OneShotTimer<StatusChangeChecker> timer; + base::OneShotTimer timer; timer.Start(FROM_HERE, GetTimeoutDuration(), base::Bind(&StatusChangeChecker::OnTimeout, diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context.cc b/chrome/browser/sync_file_system/local/local_file_sync_context.cc index 0aafc6d..571ceab 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_context.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_context.cc @@ -678,7 +678,7 @@ void LocalFileSyncContext::InitializeFileSystemContextOnIOThread( DCHECK(!sync_status_); DCHECK(!timer_on_io_); sync_status_.reset(new LocalFileSyncStatus); - timer_on_io_.reset(new base::OneShotTimer<LocalFileSyncContext>); + timer_on_io_.reset(new base::OneShotTimer); operation_runner_.reset(new SyncableFileOperationRunner( kMaxConcurrentSyncableOperation, sync_status_.get())); diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context.h b/chrome/browser/sync_file_system/local/local_file_sync_context.h index 96a0ba44..1cfc04d 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_context.h +++ b/chrome/browser/sync_file_system/local/local_file_sync_context.h @@ -360,7 +360,7 @@ class LocalFileSyncContext // Used only on IO thread for available changes notifications. base::Time last_notified_changes_; - scoped_ptr<base::OneShotTimer<LocalFileSyncContext> > timer_on_io_; + scoped_ptr<base::OneShotTimer> timer_on_io_; std::vector<base::Closure> pending_completion_callbacks_; std::set<GURL> origins_with_pending_changes_; diff --git a/chrome/browser/sync_file_system/sync_process_runner.cc b/chrome/browser/sync_file_system/sync_process_runner.cc index 748d21a..619a6bd 100644 --- a/chrome/browser/sync_file_system/sync_process_runner.cc +++ b/chrome/browser/sync_file_system/sync_process_runner.cc @@ -39,7 +39,7 @@ class BaseTimerHelper : public SyncProcessRunner::TimerHelper { ~BaseTimerHelper() override {} private: - base::OneShotTimer<SyncProcessRunner> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(BaseTimerHelper); }; diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc index a003f0f..edeccd0 100644 --- a/chrome/browser/task_manager/task_manager_browsertest_util.cc +++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc @@ -174,7 +174,7 @@ class ResourceChangeObserver : public TaskManagerModelObserver { const ColumnSpecifier column_specifier_; const size_t min_column_value_; base::RunLoop run_loop_; - base::OneShotTimer<ResourceChangeObserver> timer_; + base::OneShotTimer timer_; }; } // namespace diff --git a/chrome/browser/ui/app_list/search/common/webservice_search_provider.h b/chrome/browser/ui/app_list/search/common/webservice_search_provider.h index 61aaf22..f332f60 100644 --- a/chrome/browser/ui/app_list/search/common/webservice_search_provider.h +++ b/chrome/browser/ui/app_list/search/common/webservice_search_provider.h @@ -43,7 +43,7 @@ class WebserviceSearchProvider : public SearchProvider { base::Time last_keytyped_; // The timer to throttle QPS. - base::OneShotTimer<WebserviceSearchProvider> query_throttler_; + base::OneShotTimer query_throttler_; // The flag for tests. It prevents the throttling If set to false. bool use_throttling_; diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h index fa6fe3d..768c6c3 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h @@ -45,7 +45,7 @@ class LauncherSearchProvider : public SearchProvider { extension_results_; // A timer to delay query. - base::OneShotTimer<LauncherSearchProvider> query_timer_; + base::OneShotTimer query_timer_; // The timestamp of the last query. base::Time last_query_time_; diff --git a/chrome/browser/ui/ash/app_sync_ui_state.h b/chrome/browser/ui/ash/app_sync_ui_state.h index e130826..6604031 100644 --- a/chrome/browser/ui/ash/app_sync_ui_state.h +++ b/chrome/browser/ui/ash/app_sync_ui_state.h @@ -78,7 +78,7 @@ class AppSyncUIState : public KeyedService, ProfileSyncService* sync_service_; // Timer to limit how much time STATUS_SYNCING is allowed. - base::OneShotTimer<AppSyncUIState> max_syncing_status_timer_; + base::OneShotTimer max_syncing_status_timer_; Status status_; base::ObserverList<AppSyncUIStateObserver> observers_; diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h index 563404a..58bc886 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h @@ -579,7 +579,7 @@ class AutofillDialogControllerImpl // The timer that delays enabling submit button for a short period of time on // startup. - base::OneShotTimer<AutofillDialogControllerImpl> submit_button_delay_timer_; + base::OneShotTimer submit_button_delay_timer_; base::WeakPtrFactory<AutofillDialogControllerImpl> weak_ptr_factory_; diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h index 63bbc48..b93fd75 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h @@ -110,22 +110,22 @@ class ExclusiveAccessBubble : public gfx::AnimationDelegate { // When this timer is active, prevent the bubble from hiding. This ensures it // will be displayed for a minimum amount of time (which can be extended by // the user moving the mouse to the top of the screen and holding it there). - base::OneShotTimer<ExclusiveAccessBubble> hide_timeout_; + base::OneShotTimer hide_timeout_; // Timer to see how long the mouse has been idle. - base::OneShotTimer<ExclusiveAccessBubble> idle_timeout_; + base::OneShotTimer idle_timeout_; // When this timer has elapsed, on the next mouse input, we will notify the // user about any currently active exclusive access. This is used to enact // both the initial debounce period, and the snooze period before re-notifying // the user (see notification display design note above). - base::OneShotTimer<ExclusiveAccessBubble> suppress_notify_timeout_; + base::OneShotTimer suppress_notify_timeout_; // Timer to poll the current mouse position. We can't just listen for mouse // events without putting a non-empty HWND onscreen (or hooking Windows, which // has other problems), so instead we run a low-frequency poller to see if the // user has moved in or out of our show/hide regions. - base::RepeatingTimer<ExclusiveAccessBubble> mouse_position_checker_; + base::RepeatingTimer mouse_position_checker_; // The most recently seen mouse position, in screen coordinates. Used to see // if the mouse has moved since our last check. diff --git a/chrome/browser/ui/panels/display_settings_provider.h b/chrome/browser/ui/panels/display_settings_provider.h index 3a708ae..8923d13 100644 --- a/chrome/browser/ui/panels/display_settings_provider.h +++ b/chrome/browser/ui/panels/display_settings_provider.h @@ -149,7 +149,7 @@ class DisplaySettingsProvider { bool is_full_screen_; // Timer used to detect full-screen mode change. - base::RepeatingTimer<DisplaySettingsProvider> full_screen_mode_timer_; + base::RepeatingTimer full_screen_mode_timer_; DISALLOW_COPY_AND_ASSIGN(DisplaySettingsProvider); }; diff --git a/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc b/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc index 774fb60..6d786fc 100644 --- a/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc +++ b/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc @@ -25,13 +25,13 @@ class PanelMouseWatcherTimer : public PanelMouseWatcher { // Timer callback function. void DoWork(); - friend class base::RepeatingTimer<PanelMouseWatcherTimer>; + friend class base::RepeatingTimer; // Timer used to track mouse movements. Some OSes do not provide an easy way // of tracking mouse movements across applications. So we use a timer to // accomplish the same. This could also be more efficient as you end up // getting a lot of notifications when tracking mouse movements. - base::RepeatingTimer<PanelMouseWatcherTimer> timer_; + base::RepeatingTimer timer_; DISALLOW_COPY_AND_ASSIGN(PanelMouseWatcherTimer); }; diff --git a/chrome/browser/ui/views/app_list/win/activation_tracker_win.h b/chrome/browser/ui/views/app_list/win/activation_tracker_win.h index 6c619b4..fa97670 100644 --- a/chrome/browser/ui/views/app_list/win/activation_tracker_win.h +++ b/chrome/browser/ui/views/app_list/win/activation_tracker_win.h @@ -45,7 +45,7 @@ class ActivationTrackerWin : public app_list::AppListViewObserver { // Timer used to check if the taskbar or app list is active. Using a timer // means we don't need to hook Windows, which is apparently not possible // since Vista (and is not nice at any time). - base::RepeatingTimer<ActivationTrackerWin> timer_; + base::RepeatingTimer timer_; DISALLOW_COPY_AND_ASSIGN(ActivationTrackerWin); }; diff --git a/chrome/browser/ui/views/autofill/tooltip_icon.h b/chrome/browser/ui/views/autofill/tooltip_icon.h index c16c4ad..709dd83 100644 --- a/chrome/browser/ui/views/autofill/tooltip_icon.h +++ b/chrome/browser/ui/views/autofill/tooltip_icon.h @@ -71,7 +71,7 @@ class TooltipIcon : public views::ImageView, views::BubbleBorder::Arrow bubble_arrow_; // A timer to delay showing |bubble_|. - base::OneShotTimer<TooltipIcon> show_timer_; + base::OneShotTimer show_timer_; // A watcher that keeps |bubble_| open if the user's mouse enters it. scoped_ptr<views::MouseWatcher> mouse_watcher_; diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.h b/chrome/browser/ui/views/critical_notification_bubble_view.h index 8b769cf..e7b8474 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.h +++ b/chrome/browser/ui/views/critical_notification_bubble_view.h @@ -57,7 +57,7 @@ class CriticalNotificationBubbleView : public views::BubbleDelegateView, views::LabelButton* dismiss_button_; // A timer to refresh the bubble to show new countdown value. - base::RepeatingTimer<CriticalNotificationBubbleView> refresh_timer_; + base::RepeatingTimer refresh_timer_; // When the bubble was created. base::Time bubble_created_; diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 6974244..da76670 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -237,9 +237,10 @@ void DownloadItemView::StartDownloadProgress() { if (progress_timer_.IsRunning()) return; progress_start_time_ = base::TimeTicks::Now(); - progress_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds( - DownloadShelf::kProgressRateMs), - this, &DownloadItemView::SchedulePaint); + progress_timer_.Start( + FROM_HERE, + base::TimeDelta::FromMilliseconds(DownloadShelf::kProgressRateMs), + base::Bind(&DownloadItemView::SchedulePaint, base::Unretained(this))); } void DownloadItemView::StopDownloadProgress() { diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h index 87a2946..7504ce9 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -308,7 +308,7 @@ class DownloadItemView : public views::ButtonListener, scoped_ptr<gfx::SlideAnimation> complete_animation_; // Progress animation - base::RepeatingTimer<DownloadItemView> progress_timer_; + base::RepeatingTimer progress_timer_; // Dangerous mode buttons. views::LabelButton* save_button_; diff --git a/chrome/browser/ui/views/download/download_item_view_md.cc b/chrome/browser/ui/views/download/download_item_view_md.cc index 5e16453..5f22ae6 100644 --- a/chrome/browser/ui/views/download/download_item_view_md.cc +++ b/chrome/browser/ui/views/download/download_item_view_md.cc @@ -242,9 +242,10 @@ void DownloadItemViewMd::StartDownloadProgress() { if (progress_timer_.IsRunning()) return; progress_start_time_ = base::TimeTicks::Now(); - progress_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds( - DownloadShelf::kProgressRateMs), - this, &DownloadItemViewMd::SchedulePaint); + progress_timer_.Start( + FROM_HERE, + base::TimeDelta::FromMilliseconds(DownloadShelf::kProgressRateMs), + base::Bind(&DownloadItemViewMd::SchedulePaint, base::Unretained(this))); } void DownloadItemViewMd::StopDownloadProgress() { diff --git a/chrome/browser/ui/views/download/download_item_view_md.h b/chrome/browser/ui/views/download/download_item_view_md.h index 3c624d6..787132c 100644 --- a/chrome/browser/ui/views/download/download_item_view_md.h +++ b/chrome/browser/ui/views/download/download_item_view_md.h @@ -288,7 +288,7 @@ class DownloadItemViewMd : public views::ButtonListener, scoped_ptr<gfx::SlideAnimation> complete_animation_; // Progress animation - base::RepeatingTimer<DownloadItemViewMd> progress_timer_; + base::RepeatingTimer progress_timer_; // Dangerous mode buttons. views::LabelButton* save_button_; diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index a18f748..0fb79f7 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -687,7 +687,7 @@ class BrowserView : public BrowserWindow, #endif // The timer used to update frames for the Loading Animation. - base::RepeatingTimer<BrowserView> loading_animation_timer_; + base::RepeatingTimer loading_animation_timer_; views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler.h b/chrome/browser/ui/views/frame/web_contents_close_handler.h index 9afa372..2beccbf 100644 --- a/chrome/browser/ui/views/frame/web_contents_close_handler.h +++ b/chrome/browser/ui/views/frame/web_contents_close_handler.h @@ -47,7 +47,7 @@ class WebContentsCloseHandler { // was invoked following a WillCloseAllTabs()). bool tab_changed_after_clone_; - base::OneShotTimer<WebContentsCloseHandler> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(WebContentsCloseHandler); }; diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h index 83bb3f3..17debce 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h @@ -116,7 +116,7 @@ class ZoomBubbleView : public ManagedFullScreenBubbleDelegateView, static ZoomBubbleView* zoom_bubble_; // Timer used to close the bubble when |auto_close_| is true. - base::OneShotTimer<ZoomBubbleView> timer_; + base::OneShotTimer timer_; // Image button in the zoom bubble that will show the |extension_icon_| image // if an extension initiated the zoom change, and links to that extension at diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc index b1391a2..c2a5b2a 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc @@ -300,7 +300,7 @@ class ManagePasswordsBubbleView::AutoSigninView ManagePasswordsBubbleView::auto_signin_toast_timeout_); } - base::OneShotTimer<AutoSigninView> timer_; + base::OneShotTimer timer_; ManagePasswordsBubbleView* parent_; ScopedObserver<views::Widget, views::WidgetObserver> observed_browser_; diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.h b/chrome/browser/ui/views/tabs/tab_drag_controller.h index bb2412a..1173ef0 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.h +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.h @@ -510,11 +510,11 @@ class TabDragController : public content::NotificationObserver, // Timer used to bring the window under the cursor to front. If the user // stops moving the mouse for a brief time over a browser window, it is // brought to front. - base::OneShotTimer<TabDragController> bring_to_front_timer_; + base::OneShotTimer bring_to_front_timer_; // Timer used to move the stacked tabs. See comment aboue // StartMoveStackedTimerIfNecessary(). - base::OneShotTimer<TabDragController> move_stacked_timer_; + base::OneShotTimer move_stacked_timer_; // Did the mouse move enough that we started a drag? bool started_drag_; diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index a8153da..c33cba7 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h @@ -664,7 +664,7 @@ class TabStrip : public views::View, // Timer used when a tab is closed and we need to relayout. Only used when a // tab close comes from a touch device. - base::OneShotTimer<TabStrip> resize_layout_timer_; + base::OneShotTimer resize_layout_timer_; // True if tabs are painted as rectangular light-bars. bool immersive_style_; diff --git a/chrome/browser/ui/views/toolbar/reload_button.h b/chrome/browser/ui/views/toolbar/reload_button.h index 7c9fd18..7d113ef 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.h +++ b/chrome/browser/ui/views/toolbar/reload_button.h @@ -78,8 +78,8 @@ class ReloadButton : public ToolbarButton, void OnDoubleClickTimer(); void OnStopToReloadTimer(); - base::OneShotTimer<ReloadButton> double_click_timer_; - base::OneShotTimer<ReloadButton> stop_to_reload_timer_; + base::OneShotTimer double_click_timer_; + base::OneShotTimer stop_to_reload_timer_; // This may be NULL when testing. CommandUpdater* command_updater_; diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 248d5f4..ba784a1 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -204,7 +204,7 @@ class ChromeOSOnlineTermsHandler : public net::URLFetcherDelegate { // Timer that enforces a timeout on the attempt to download the // ChromeOS Terms. - base::OneShotTimer<ChromeOSOnlineTermsHandler> download_timer_; + base::OneShotTimer download_timer_; // |fetch_callback_| called when fetching succeeded or failed. FetchCallback fetch_callback_; diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h index 8c27c0e..eb77be0 100644 --- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h +++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h @@ -42,7 +42,7 @@ class DemoModeDetector { scoped_ptr<IdleDetector> idle_detector_; - base::RepeatingTimer<DemoModeDetector> oobe_timer_; + base::RepeatingTimer oobe_timer_; // Timeout to detect if the machine is in a derelict state. base::TimeDelta derelict_detection_timeout_; diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h index e4e60c5..194db47 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h @@ -75,7 +75,7 @@ class NetworkDropdown : public NetworkMenu::Delegate, bool oobe_; // Timer used to periodically force network scan. - base::RepeatingTimer<NetworkDropdown> network_scan_timer_; + base::RepeatingTimer network_scan_timer_; DISALLOW_COPY_AND_ASSIGN(NetworkDropdown); }; diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index df176c9..f702443 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -113,7 +113,7 @@ class FlashDOMHandler : public WebUIMessageHandler, void OnTimeout(); // A timer to keep track of when the data fetching times out. - base::OneShotTimer<FlashDOMHandler> timeout_; + base::OneShotTimer timeout_; // Crash list. scoped_refptr<CrashUploadList> upload_list_; diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index 10d1abc..3d5dcb2 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -207,7 +207,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler, std::vector<HistoryEntry> web_history_query_results_; // Timer used to implement a timeout on a Web History response. - base::OneShotTimer<BrowsingHistoryHandler> web_history_timer_; + base::OneShotTimer web_history_timer_; ScopedObserver<history::HistoryService, history::HistoryServiceObserver> history_service_observer_; diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index 79899a3..0073925 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -131,7 +131,7 @@ class NewTabUI : public content::WebUIController, // The last time we got a paint notification. base::TimeTicks last_paint_; // Scoping so we can be sure our timeouts don't outlive us. - base::OneShotTimer<NewTabUI> timer_; + base::OneShotTimer timer_; // The preference version. This used for migrating prefs of the NTP. static const int current_pref_version_ = 3; diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc index a2f8469..bbaa360 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc @@ -418,7 +418,7 @@ void SyncSetupHandler::DisplaySpinner() { const int kTimeoutSec = 30; DCHECK(!backend_start_timer_); - backend_start_timer_.reset(new base::OneShotTimer<SyncSetupHandler>()); + backend_start_timer_.reset(new base::OneShotTimer()); backend_start_timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeoutSec), this, &SyncSetupHandler::DisplayTimeout); diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/options/sync_setup_handler.h index 4ed025a..0065ecc 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.h +++ b/chrome/browser/ui/webui/options/sync_setup_handler.h @@ -152,7 +152,7 @@ class SyncSetupHandler : public options::OptionsPageUIHandler, // The OneShotTimer object used to timeout of starting the sync backend // service. - scoped_ptr<base::OneShotTimer<SyncSetupHandler> > backend_start_timer_; + scoped_ptr<base::OneShotTimer> backend_start_timer_; DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler); }; diff --git a/chrome/browser/upgrade_detector.h b/chrome/browser/upgrade_detector.h index e117a67..8cb4885 100644 --- a/chrome/browser/upgrade_detector.h +++ b/chrome/browser/upgrade_detector.h @@ -163,7 +163,7 @@ class UpgradeDetector { // A timer to check to see if we've been idle for long enough to show the // critical warning. Should only be set if |upgrade_available_| is // UPGRADE_AVAILABLE_CRITICAL. - base::RepeatingTimer<UpgradeDetector> idle_check_timer_; + base::RepeatingTimer idle_check_timer_; // The stage at which the annoyance level for upgrade notifications is at. UpgradeNotificationAnnoyanceLevel upgrade_notification_stage_; diff --git a/chrome/browser/upgrade_detector_impl.h b/chrome/browser/upgrade_detector_impl.h index f5a5a1c2..7beaf31 100644 --- a/chrome/browser/upgrade_detector_impl.h +++ b/chrome/browser/upgrade_detector_impl.h @@ -74,11 +74,11 @@ class UpgradeDetectorImpl : public UpgradeDetector, base::WeakPtr<UpgradeDetectorImpl> upgrade_detector); // We periodically check to see if Chrome has been upgraded. - base::RepeatingTimer<UpgradeDetectorImpl> detect_upgrade_timer_; + base::RepeatingTimer detect_upgrade_timer_; // After we detect an upgrade we start a recurring timer to see if enough time // has passed and we should start notifying the user. - base::RepeatingTimer<UpgradeDetectorImpl> upgrade_notification_timer_; + base::RepeatingTimer upgrade_notification_timer_; // True if this build is a dev or canary channel build. bool is_unstable_channel_; diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc index 83cbbcc..050b53f 100644 --- a/chrome/test/base/tracing.cc +++ b/chrome/test/base/tracing.cc @@ -151,7 +151,7 @@ class InProcessTraceController { scoped_refptr<content::MessageLoopRunner> message_loop_runner_; - base::OneShotTimer<InProcessTraceController> timer_; + base::OneShotTimer timer_; bool is_waiting_on_watch_; int watch_notification_count_; diff --git a/chrome/test/remoting/waiter.h b/chrome/test/remoting/waiter.h index 9201d77..ba5183d 100644 --- a/chrome/test/remoting/waiter.h +++ b/chrome/test/remoting/waiter.h @@ -33,7 +33,7 @@ class TimeoutWaiter { // Callback used to cancel the TimeoutWaiter::Wait. void CancelWaitCallback(); - base::OneShotTimer<TimeoutWaiter> timeout_timer_; + base::OneShotTimer timeout_timer_; base::TimeDelta timeout_; scoped_refptr<content::MessageLoopRunner> message_loop_runner_; @@ -63,7 +63,7 @@ class ConditionalTimeoutWaiter : public TimeoutWaiter { base::TimeDelta interval_; Predicate callback_; - base::RepeatingTimer<ConditionalTimeoutWaiter> condition_timer_; + base::RepeatingTimer condition_timer_; bool success_; DISALLOW_COPY_AND_ASSIGN(ConditionalTimeoutWaiter); |