Move web store data fetching and parsing out of WebstoreStandaloneInstaller.

chrome/browser/extensions/webstore_standalone_installer.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_EXTENSIONS_WEBSTORE_STANDALONE_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_WEBSTORE_STANDALONE_INSTALLER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
+#include "chrome/browser/extensions/webstore_data_fetcher_delegate.h"
 #include "chrome/browser/extensions/webstore_install_helper.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 
 namespace net {
 class URLFetcher;
 }
 
 namespace extensions {
 class Extension;
-class SafeWebstoreResponseParser;
+class WebstoreDataFetcher;
 
 // Manages inline installs requested by a page (downloads and parses metadata
 // from the webstore, shows the install UI, starts the download once the user
 // confirms).  Clients must implement the WebstoreStandaloneInstaller::Delegate
 // interface to be notified when the inline install completes (successfully or
 // not). The client will not be notified if the WebContents that this install
 // request is attached to goes away.
 class WebstoreStandaloneInstaller
     : public base::RefCountedThreadSafe<WebstoreStandaloneInstaller>,
       public ExtensionInstallPrompt::Delegate,
       public content::WebContentsObserver,
-      public net::URLFetcherDelegate,
+      public WebstoreDataFetcherDelegate,
       public WebstoreInstaller::Delegate,
       public WebstoreInstallHelper::Delegate {
  public:
   enum VerifiedSiteRequired {
     REQUIRE_VERIFIED_SITE,
     DO_NOT_REQUIRE_VERIFIED_SITE
   };
 
   enum PromptType {
     STANDARD_PROMPT,
@@ skipping 12 matching lines @@
                               PromptType prompt_type,
                               GURL requestor_url,
                               Callback callback);
 
   void set_skip_post_install_ui(bool skip) { skip_post_install_ui_ = skip; }
 
   void BeginInstall();
 
  private:
   friend class base::RefCountedThreadSafe<WebstoreStandaloneInstaller>;
-  friend class SafeWebstoreResponseParser;
   FRIEND_TEST_ALL_PREFIXES(WebstoreStandaloneInstallerTest, DomainVerification);
 
   virtual ~WebstoreStandaloneInstaller();
 
   // Several delegate/client inteface implementations follow. The normal flow
   // (for successful installs) is:
   //
   // 1. BeginInstall: starts the fetch of data from the webstore
   // 2. OnURLFetchComplete: starts the parsing of data from the webstore
   // 3. OnWebstoreResponseParseSuccess: starts the parsing of the manifest and
   //    fetching of icon data.
   // 4. OnWebstoreParseSuccess: shows the install UI
   // 5. InstallUIProceed: initiates the .crx download/install
   //
   // All flows (whether successful or not) end up in CompleteInstall, which
   // informs our delegate of success/failure.
 
-  // net::URLFetcherDelegate interface implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
-
-  // Client callbacks for SafeWebstoreResponseParser when parsing is complete.
-  void OnWebstoreResponseParseSuccess(DictionaryValue* webstore_data);
-  void OnWebstoreResponseParseFailure(const std::string& error);
+  // WebstoreDataFetcherDelegate interface implementation.
+  virtual void OnWebstoreRequestFailure() OVERRIDE;
+  virtual void OnWebstoreResponseParseSuccess(
+      base::DictionaryValue* webstore_data) OVERRIDE;
+  virtual void OnWebstoreResponseParseFailure(
+      const std::string& error) OVERRIDE;
 
   // WebstoreInstallHelper::Delegate interface implementation.
   virtual void OnWebstoreParseSuccess(
       const std::string& id,
       const SkBitmap& icon,
       base::DictionaryValue* parsed_manifest) OVERRIDE;
   virtual void OnWebstoreParseFailure(
       const std::string& id,
       InstallHelperResultCode result_code,
       const std::string& error_message) OVERRIDE;
@@ skipping 22 matching lines @@
 
   std::string id_;
   bool require_verified_site_;
   PromptType prompt_type_;
   GURL requestor_url_;
   Callback callback_;
   scoped_ptr<ExtensionInstallPrompt> install_ui_;
   bool skip_post_install_ui_;
 
   // For fetching webstore JSON data.
-  scoped_ptr<net::URLFetcher> webstore_data_url_fetcher_;
+  scoped_ptr<WebstoreDataFetcher> webstore_data_fetcher_;
 
   // Extracted from the webstore JSON data response.
   std::string localized_name_;
   std::string localized_description_;
   std::string localized_user_count_;
   double average_rating_;
   int rating_count_;
   scoped_ptr<DictionaryValue> webstore_data_;
   scoped_ptr<DictionaryValue> manifest_;
   scoped_refptr<Extension> dummy_extension_;
   SkBitmap icon_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebstoreStandaloneInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_WEBSTORE_STANDALONE_INSTALLER_H_