| Index: components/google/core/browser/google_url_tracker.cc
|
| diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc
|
| index 9a21ca4934fae631c959471b8c702d3bcc4890fd..810a5bdd5806a1e9e441d3e95cf6c6686f1ad9de 100644
|
| --- a/components/google/core/browser/google_url_tracker.cc
|
| +++ b/components/google/core/browser/google_url_tracker.cc
|
| @@ -29,8 +29,9 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] =
|
| const char GoogleURLTracker::kSearchDomainCheckURL[] =
|
| "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
|
|
|
| -GoogleURLTracker::GoogleURLTracker(scoped_ptr<GoogleURLTrackerClient> client,
|
| - Mode mode)
|
| +GoogleURLTracker::GoogleURLTracker(
|
| + std::unique_ptr<GoogleURLTrackerClient> client,
|
| + Mode mode)
|
| : client_(std::move(client)),
|
| google_url_(mode == UNIT_TEST_MODE ? kDefaultGoogleHomepage
|
| : client_->GetPrefs()->GetString(
|
| @@ -82,14 +83,14 @@ void GoogleURLTracker::RequestServerCheck(bool force) {
|
| }
|
| }
|
|
|
| -scoped_ptr<GoogleURLTracker::Subscription> GoogleURLTracker::RegisterCallback(
|
| - const OnGoogleURLUpdatedCallback& cb) {
|
| +std::unique_ptr<GoogleURLTracker::Subscription>
|
| +GoogleURLTracker::RegisterCallback(const OnGoogleURLUpdatedCallback& cb) {
|
| return callback_list_.Add(cb);
|
| }
|
|
|
| void GoogleURLTracker::OnURLFetchComplete(const net::URLFetcher* source) {
|
| // Delete the fetcher on this function's exit.
|
| - scoped_ptr<net::URLFetcher> clean_up_fetcher(fetcher_.release());
|
| + std::unique_ptr<net::URLFetcher> clean_up_fetcher(std::move(fetcher_));
|
|
|
| // Don't update the URL if the request didn't succeed.
|
| if (!source->GetStatus().is_success() || (source->GetResponseCode() != 200)) {
|
|
|