Index: chrome/browser/ui/webui/options/sync_setup_handler.h |
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/options/sync_setup_handler.h |
index 013c14ada925900657ed044d1a45ed43c021daba..2ca7278e8373db9a14a9e452c92566c0fb4957b9 100644 |
--- a/chrome/browser/ui/webui/options/sync_setup_handler.h |
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.h |
@@ -5,9 +5,10 @@ |
#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_ |
#define CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_ |
+#include <memory> |
+ |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/timer/timer.h" |
#include "build/build_config.h" |
#include "chrome/browser/sync/sync_startup_tracker.h" |
@@ -150,7 +151,7 @@ class SyncSetupHandler : public options::OptionsPageUIHandler, |
void DisplayConfigureSync(bool passphrase_failed); |
// Helper object used to wait for the sync backend to startup. |
- scoped_ptr<SyncStartupTracker> sync_startup_tracker_; |
+ std::unique_ptr<SyncStartupTracker> sync_startup_tracker_; |
// Set to true whenever the sync configure UI is visible. This is used to tell |
// what stage of the setup wizard the user was in and to update the UMA |
@@ -159,7 +160,7 @@ class SyncSetupHandler : public options::OptionsPageUIHandler, |
// The OneShotTimer object used to timeout of starting the sync backend |
// service. |
- scoped_ptr<base::OneShotTimer> backend_start_timer_; |
+ std::unique_ptr<base::OneShotTimer> backend_start_timer_; |
DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler); |
}; |