Move SafeBeginInstallHelper to be a top-level class (WebstoreInstallHelper).

chrome/browser/extensions/extension_webstore_private_api.h

 // Copyright (c) 2011 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_EXTENSION_WEBSTORE_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBSTORE_PRIVATE_API_H_
 #pragma once
 
 #include <string>
 
 #include "chrome/browser/browser_signin.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
+#include "chrome/browser/extensions/webstore_install_helper.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class ProfileSyncService;
 
 class WebstorePrivateApi {
  public:
   // Allows you to set the ProfileSyncService the function will use for
   // testing purposes.
   static void SetTestingProfileSyncService(ProfileSyncService* service);
 
   // Allows you to set the BrowserSignin the function will use for
   // testing purposes.
   static void SetTestingBrowserSignin(BrowserSignin* signin);
 };
 
 // TODO(asargent): this is being deprecated in favor of
 // BeginInstallWithManifestFunction. See crbug.com/75821 for details.
 class BeginInstallFunction : public SyncExtensionFunction {
  public:
   // For use only in tests - sets a flag that can cause this function to ignore
   // the normal requirement that it is called during a user gesture.
   static void SetIgnoreUserGestureForTests(bool ignore);
  protected:
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("webstorePrivate.beginInstall");
 };
 
-class BeginInstallWithManifestFunction : public AsyncExtensionFunction,
-                                         public ExtensionInstallUI::Delegate {
+class BeginInstallWithManifestFunction
+    : public AsyncExtensionFunction,
+      public ExtensionInstallUI::Delegate,
+      public WebstoreInstallHelper::Delegate {
  public:
   BeginInstallWithManifestFunction();
 
   // Result codes for the return value. If you change this, make sure to
   // update the description for the beginInstallWithManifest callback in
   // extension_api.json.
   enum ResultCode {
     ERROR_NONE = 0,
 
     // An unspecified error occurred.
@@ skipping 23 matching lines @@
 
   // For use only in tests - sets a flag that can cause this function to ignore
   // the normal requirement that it is called during a user gesture.
   static void SetIgnoreUserGestureForTests(bool ignore);
 
   // For use only in tests - sets a flag that makes invocations of
   // beginInstallWithManifest skip putting up a real dialog, and instead act
   // as if the dialog choice was to proceed or abort.
   static void SetAutoConfirmForTests(bool should_proceed);
 
-  // Called when we've successfully parsed the manifest and decoded the icon in
-  // the utility process. Ownership of parsed_manifest is transferred.
-  void OnParseSuccess(const SkBitmap& icon,
-                      base::DictionaryValue* parsed_manifest);
-
-  // Called to indicate a parse failure. The |result_code| parameter should
-  // indicate whether the problem was with the manifest or icon.
-  void OnParseFailure(ResultCode result_code, const std::string& error_message);
+  // Implementing WebstoreInstallHelper::Delegate interface.
+  virtual void OnWebstoreParseSuccess(
+      const SkBitmap& icon,
+      base::DictionaryValue* parsed_manifest) OVERRIDE;
+  virtual void OnWebstoreParseFailure(
+      InstallHelperResultCode result_code,
+      const std::string& error_message) OVERRIDE;
 
   // Implementing ExtensionInstallUI::Delegate interface.
   virtual void InstallUIProceed() OVERRIDE;
   virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
  protected:
   virtual ~BeginInstallWithManifestFunction();
   virtual bool RunImpl();
 
   // Sets the result_ as a string based on |code|.
@@ skipping 63 matching lines @@
   // Are we waiting for a token available notification?
   bool waiting_for_token_;
 
   // Used for listening for TokenService notifications.
   NotificationRegistrar registrar_;
 
   DECLARE_EXTENSION_FUNCTION_NAME("webstorePrivate.promptBrowserLogin");
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBSTORE_PRIVATE_API_H_