Make OAuth2TokenService and subclasses take delegate by unique_ptr

components/ntp_snippets/remote/remote_suggestions_fetcher_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ntp_snippets/remote/remote_suggestions_fetcher.h"
 
 #include <deque>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 277 matching lines @@
     user_classifier_ = base::MakeUnique<UserClassifier>(utils_.pref_service());
     // Increase initial time such that ticks are non-zero.
     mock_task_runner_->FastForwardBy(base::TimeDelta::FromMilliseconds(1234));
     ResetFetcher();
   }
 
   void ResetFetcher() {
     scoped_refptr<net::TestURLRequestContextGetter> request_context_getter =
         new net::TestURLRequestContextGetter(mock_task_runner_.get());
 
-    fake_token_service_delegate_ =
-        new FakeOAuth2TokenServiceDelegate(request_context_getter.get());
-    // Not a memleak because OAuth2TokenService takes ownership of the raw
-    // pointer (crbug.com/688387).
     fake_token_service_ = base::MakeUnique<FakeProfileOAuth2TokenService>(
-        fake_token_service_delegate_);
+        base::MakeUnique<FakeOAuth2TokenServiceDelegate>(
+            request_context_getter.get()));
 
     fetcher_ = base::MakeUnique<RemoteSuggestionsFetcher>(
         utils_.fake_signin_manager(), fake_token_service_.get(),
         std::move(request_context_getter), utils_.pref_service(), nullptr,
         base::Bind(&ParseJsonDelayed), kAPIKey, user_classifier_.get());
 
     fetcher_->SetTickClockForTesting(mock_task_runner_->GetMockTickClock());
   }
 
   void SignIn() { utils_.fake_signin_manager()->SignIn(kTestEmail); }
 
   void IssueRefreshToken() {
-    fake_token_service_delegate_->UpdateCredentials(kTestEmail, "token");
+    fake_token_service_->GetDelegate()->UpdateCredentials(kTestEmail, "token");
   }
 
   void IssueOAuth2Token() {
     fake_token_service_->IssueAllTokensForAccount(kTestEmail, "access_token",
                                                   base::Time::Max());
   }
 
   void CancelOAuth2TokenRequests() {
     fake_token_service_->IssueErrorForAllPendingRequestsForAccount(
         kTestEmail, GoogleServiceAuthError(
@@ skipping 52 matching lines @@
   std::map<std::string, std::string> default_variation_params_;
 
  private:
   test::RemoteSuggestionsTestUtils utils_;
   variations::testing::VariationParamsManager params_manager_;
   scoped_refptr<base::TestMockTimeTaskRunner> mock_task_runner_;
   base::ThreadTaskRunnerHandle mock_task_runner_handle_;
   FailingFakeURLFetcherFactory failing_url_fetcher_factory_;
   // Initialized lazily in SetFakeResponse().
   std::unique_ptr<net::FakeURLFetcherFactory> fake_url_fetcher_factory_;
-  FakeOAuth2TokenServiceDelegate* fake_token_service_delegate_;
   std::unique_ptr<FakeProfileOAuth2TokenService> fake_token_service_;
   std::unique_ptr<RemoteSuggestionsFetcher> fetcher_;
   std::unique_ptr<UserClassifier> user_classifier_;
   MockSnippetsAvailableCallback mock_callback_;
   const GURL test_url_;
   base::HistogramTester histogram_tester_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteSuggestionsFetcherTestBase);
 };
 
@@ skipping 620 matching lines @@
         fetched_categories) {
   if (fetched_categories) {
     // Matchers above aren't any more precise than this, so this is sufficient
     // for test-failure diagnostics.
     return os << "list with " << fetched_categories->size() << " elements";
   }
   return os << "null";
 }
 
 }  // namespace ntp_snippets