Change google_api::RequestSender to take an AuthService instead of a Profile.

chrome/browser/google_apis/request_sender.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_REQUEST_SENDER_H_
 #define CHROME_BROWSER_GOOGLE_APIS_REQUEST_SENDER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 12 matching lines @@
 class TaskRunner;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace google_apis {
 
 class AuthenticatedRequestInterface;
-class AuthService;
+class AuthServiceInterface;
 
 // Helper class that sends requests implementing
 // AuthenticatedRequestInterface and handles retries and authentication.
 class RequestSender {
  public:
+  // |auth_service| is used for fetching OAuth tokens. It'll be owned by
+  // this RequestSender.
+  //
   // |url_request_context_getter| is the context used to perform network
   // requests from this RequestSender.
   //
   // |blocking_task_runner| is used for running blocking operation, e.g.,
   // parsing JSON response from the server.
   //
   // |scopes| specifies OAuth2 scopes.
   //
   // |custom_user_agent| will be used for the User-Agent header in HTTP
   // requests issued through the request sender if the value is not empty.
-  RequestSender(Profile* profile,
+  RequestSender(AuthServiceInterface* auth_service,
                 net::URLRequestContextGetter* url_request_context_getter,
                 base::TaskRunner* blocking_task_runner,
-                const std::vector<std::string>& scopes,
                 const std::string& custom_user_agent);
-  virtual ~RequestSender();
+  ~RequestSender();
 
-  AuthService* auth_service() { return auth_service_.get(); }
+  AuthServiceInterface* auth_service() { return auth_service_.get(); }
 
   net::URLRequestContextGetter* url_request_context_getter() const {
     return url_request_context_getter_;
   }
 
   base::TaskRunner* blocking_task_runner() const {
     return blocking_task_runner_.get();
   }
 
-  // Prepares the object for use.
-  virtual void Initialize();
-
   // Starts a request implementing the AuthenticatedRequestInterface
   // interface, and makes the request retry upon authentication failures by
   // calling back to RetryRequest. The |request| object is owned by this
   // RequestSender. It will be deleted in RequestSender's destructor or
   // in RequestFinished().
   //
   // Returns a closure to cancel the request. The closure cancels the request
   // if it is in-flight, and does nothing if it is already terminated.
   base::Closure StartRequestWithRetry(AuthenticatedRequestInterface* request);
 
@@ skipping 10 matching lines @@
 
   // Clears any authentication token and retries the request, which forces
   // an authentication token refresh.
   void RetryRequest(AuthenticatedRequestInterface* request);
 
   // Cancels the request. Used for implementing the returned closure of
   // StartRequestWithRetry.
   void CancelRequest(
       const base::WeakPtr<AuthenticatedRequestInterface>& request);
 
-  Profile* profile_;  // Not owned.
+  scoped_ptr<AuthServiceInterface> auth_service_;
   net::URLRequestContextGetter* url_request_context_getter_;  // Not owned.
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
-  scoped_ptr<AuthService> auth_service_;
   std::set<AuthenticatedRequestInterface*> in_flight_requests_;
   const std::string custom_user_agent_;
 
   base::ThreadChecker thread_checker_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<RequestSender> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestSender);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_REQUEST_SENDER_H_