Changing CloudPrintURLFetcher instantiation to be more testable

chrome/service/cloud_print/cloud_print_url_fetcher.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_SERVICE_CLOUD_PRINT_CLOUD_PRINT_URL_FETCHER_H_
 #define CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_URL_FETCHER_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class GURL;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace net {
 class URLRequestContextGetter;
 class URLRequestStatus;
 }  // namespace net
 
 namespace cloud_print {
 
+

[gene, 2013/02/11 23:34:05]

one empty line is enough here

+// Factory for creating CloudPrintURLFetchers.
+class CloudPrintURLFetcher;
+class CloudPrintURLFetcherFactory {
+ public:
+  CloudPrintURLFetcherFactory();

[gene, 2013/02/11 23:34:05]

May be we can omit constructor/destructor here?

+  virtual ~CloudPrintURLFetcherFactory();
+  virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher()=0;

[gene, 2013/02/11 23:34:05]

add spaces around =. "() = 0;"

+};
+
+

[gene, 2013/02/11 23:34:05]

one empty line is enough here

 // A wrapper around URLFetcher for CloudPrint. URLFetcher applies retry logic
 // only on HTTP response codes >= 500. In the cloud print case, we want to
 // retry on all network errors. In addition, we want to treat non-JSON responses
 // (for all CloudPrint APIs that expect JSON responses) as errors and they
 // must also be retried.
 class CloudPrintURLFetcher
     : public base::RefCountedThreadSafe<CloudPrintURLFetcher>,
       public net::URLFetcherDelegate {
  public:
   enum ResponseAction {
@@ skipping 47 matching lines @@
     // Returning CONTINUE_PROCESSING will treat auth error as a network error.
     virtual ResponseAction OnRequestAuthError() = 0;
 
     // Authentication information may change between retries.
     // CloudPrintURLFetcher will request auth info before sending any request.
     virtual std::string GetAuthHeader() = 0;
 
    protected:
     virtual ~Delegate() {}
   };
+
+  static CloudPrintURLFetcher* Create();
+  static void set_factory(CloudPrintURLFetcherFactory* factory);
+
   CloudPrintURLFetcher();

[gene, 2013/02/11 23:34:05]

Constructor should probably be in protected section now.

 
   bool IsSameRequest(const net::URLFetcher* source);
 
   void StartGetRequest(const GURL& url,
                        Delegate* delegate,
                        int max_retries,
                        const std::string& additional_headers);
   void StartPostRequest(const GURL& url,
                         Delegate* delegate,
                         int max_retries,
@@ skipping 21 matching lines @@
                           const std::string& additional_headers);
   void SetupRequestHeaders();
 
   scoped_ptr<net::URLFetcher> request_;
   Delegate* delegate_;
   int num_retries_;
   net::URLFetcher::RequestType request_type_;
   std::string additional_headers_;
   std::string post_data_mime_type_;
   std::string post_data_;
+
+  static CloudPrintURLFetcherFactory* factory();

[gene, 2013/02/11 23:34:05]

Can you move this before declaring member variables?

 };
 
 typedef CloudPrintURLFetcher::Delegate CloudPrintURLFetcherDelegate;
 
 }  // namespace cloud_print
 
 #endif  // CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_URL_FETCHER_H_