Index: components/google/core/browser/google_url_tracker.h |
diff --git a/components/google/core/browser/google_url_tracker.h b/components/google/core/browser/google_url_tracker.h |
index c79754aa8a67f5fa8c660105dc143dfb14097f42..05271526d41adfe98c1b82bf04b23e77c483b666 100644 |
--- a/components/google/core/browser/google_url_tracker.h |
+++ b/components/google/core/browser/google_url_tracker.h |
@@ -5,10 +5,11 @@ |
#ifndef COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_URL_TRACKER_H_ |
#define COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_URL_TRACKER_H_ |
+#include <memory> |
+ |
#include "base/callback_forward.h" |
#include "base/callback_list.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "components/google/core/browser/google_url_tracker_client.h" |
#include "components/keyed_service/core/keyed_service.h" |
@@ -58,7 +59,7 @@ class GoogleURLTracker |
static const char kDefaultGoogleHomepage[]; |
// Only the GoogleURLTrackerFactory and tests should call this. |
- GoogleURLTracker(scoped_ptr<GoogleURLTrackerClient> client, Mode mode); |
+ GoogleURLTracker(std::unique_ptr<GoogleURLTrackerClient> client, Mode mode); |
~GoogleURLTracker() override; |
@@ -78,7 +79,7 @@ class GoogleURLTracker |
// check, it will check again. |
void RequestServerCheck(bool force); |
- scoped_ptr<Subscription> RegisterCallback( |
+ std::unique_ptr<Subscription> RegisterCallback( |
const OnGoogleURLUpdatedCallback& cb); |
private: |
@@ -110,10 +111,10 @@ class GoogleURLTracker |
CallbackList callback_list_; |
- scoped_ptr<GoogleURLTrackerClient> client_; |
+ std::unique_ptr<GoogleURLTrackerClient> client_; |
GURL google_url_; |
- scoped_ptr<net::URLFetcher> fetcher_; |
+ std::unique_ptr<net::URLFetcher> fetcher_; |
int fetcher_id_; |
bool in_startup_sleep_; // True if we're in the five-second "no fetching" |
// period that begins at browser start. |