Make OAuth2TokenService and subclasses take delegate by unique_ptr

google_apis/gaia/oauth2_token_service.cc

 // Copyright 2013 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 "google_apis/gaia/oauth2_token_service.h"
 
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
@@ skipping 370 matching lines @@
 
 OAuth2TokenService::Request::~Request() {
 }
 
 OAuth2TokenService::Consumer::Consumer(const std::string& id)
     : id_(id) {}
 
 OAuth2TokenService::Consumer::~Consumer() {
 }
 
-OAuth2TokenService::OAuth2TokenService(OAuth2TokenServiceDelegate* delegate)
-    : delegate_(delegate) {
+OAuth2TokenService::OAuth2TokenService(
+    std::unique_ptr<OAuth2TokenServiceDelegate> delegate)
+    : delegate_(std::move(delegate)) {
   DCHECK(delegate_);
 }
 
 OAuth2TokenService::~OAuth2TokenService() {
   // Release all the pending fetchers.
   pending_fetchers_.clear();
 }
 
 OAuth2TokenServiceDelegate* OAuth2TokenService::GetDelegate() {
   return delegate_.get();
 }
 
+const OAuth2TokenServiceDelegate* OAuth2TokenService::GetDelegate() const {
+  return delegate_.get();
+}
+
 void OAuth2TokenService::AddObserver(Observer* observer) {
   delegate_->AddObserver(observer);
 }
 
 void OAuth2TokenService::RemoveObserver(Observer* observer) {
   delegate_->RemoveObserver(observer);
 }
 
 void OAuth2TokenService::AddDiagnosticsObserver(DiagnosticsObserver* observer) {
   diagnostics_observer_list_.AddObserver(observer);
@@ skipping 397 matching lines @@
 
 size_t OAuth2TokenService::GetNumPendingRequestsForTesting(
     const std::string& client_id,
     const std::string& account_id,
     const ScopeSet& scopes) const {
   auto iter = pending_fetchers_.find(
       OAuth2TokenService::RequestParameters(client_id, account_id, scopes));
   return iter == pending_fetchers_.end() ?
              0 : iter->second->GetWaitingRequestCount();
 }