Added new GCD/Privet interfaces.

chrome/browser/local_discovery/gcd_api_flow.h

 // Copyright 2014 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_LOCAL_DISCOVERY_GCD_API_FLOW_H_
 #define CHROME_BROWSER_LOCAL_DISCOVERY_GCD_API_FLOW_H_
 
 #include <string>
 
 #include "chrome/browser/local_discovery/privet_constants.h"
 #include "chrome/browser/local_discovery/privet_http.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace local_discovery {
 
 // API flow for communicating with cloud print and cloud devices.
-class GCDApiFlow : public net::URLFetcherDelegate,
-                   public OAuth2TokenService::Consumer {
+class GCDApiFlowInterface {

[Noam Samuel, 2014/06/09 17:53:22]

Isn't it more common to write GCDApiFlow and GCDApiFlowImpl?

  public:
   // TODO(noamsml): Better error model for this class.
   enum Status {
     SUCCESS,
     ERROR_TOKEN,
     ERROR_NETWORK,
     ERROR_HTTP_CODE,
     ERROR_FROM_SERVER,
     ERROR_MALFORMED_RESPONSE
   };
@@ skipping 18 matching lines @@
     virtual std::vector<std::string> GetExtraRequestHeaders() = 0;
 
     // If there is no data, set upload_type and upload_data to ""
     virtual void GetUploadData(std::string* upload_type,
                                std::string* upload_data);
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Request);
   };
 
+  GCDApiFlowInterface();
+  virtual ~GCDApiFlowInterface();
+
+  virtual void Start(scoped_ptr<Request> request) = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(GCDApiFlowInterface);
+};
+
+class GCDApiFlow : public GCDApiFlowInterface,
+                   public net::URLFetcherDelegate,
+                   public OAuth2TokenService::Consumer {
+ public:
   // Create an OAuth2-based confirmation.
   GCDApiFlow(net::URLRequestContextGetter* request_context,
              OAuth2TokenService* token_service,
-             const std::string& account_id,
-             scoped_ptr<Request> request);
+             const std::string& account_id);
 
   virtual ~GCDApiFlow();
 
-  void Start();
+  virtual void Start(scoped_ptr<Request> request) OVERRIDE;
 
   // net::URLFetcherDelegate implementation:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // OAuth2TokenService::Consumer implementation:
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
  private:
   void CreateRequest(const GURL& url);
 
   scoped_ptr<net::URLFetcher> url_fetcher_;
   scoped_ptr<OAuth2TokenService::Request> oauth_request_;
   scoped_refptr<net::URLRequestContextGetter> request_context_;
   OAuth2TokenService* token_service_;
   std::string account_id_;
   scoped_ptr<Request> request_;
+
   DISALLOW_COPY_AND_ASSIGN(GCDApiFlow);
 };
 
-class GCDApiFlowRequest : public GCDApiFlow::Request {
+class GCDApiFlowRequest : public GCDApiFlowInterface::Request {
  public:
   GCDApiFlowRequest();
   virtual ~GCDApiFlowRequest();
 
   // GCDApiFlowRequest implementation
   virtual std::string GetOAuthScope() OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GCDApiFlowRequest);
 };
 
-class CloudPrintApiFlowRequest : public GCDApiFlow::Request {
+class CloudPrintApiFlowRequest : public GCDApiFlowInterface::Request {
  public:
   CloudPrintApiFlowRequest();
   virtual ~CloudPrintApiFlowRequest();
 
   // GCDApiFlowRequest implementation
   virtual std::string GetOAuthScope() OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CloudPrintApiFlowRequest);
 };
 
 }  // namespace local_discovery
 
 #endif  // CHROME_BROWSER_LOCAL_DISCOVERY_GCD_API_FLOW_H_