Create CrxInstaller directly in WebstoreInstaller

chrome/browser/extensions/crx_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_CRX_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 92 matching lines @@
   // Convert the specified web app into an extension and install it.
   void InstallWebApp(const WebApplicationInfo& web_app);
 
   // Overridden from ExtensionInstallPrompt::Delegate:
   virtual void InstallUIProceed() OVERRIDE;
   virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
   int creation_flags() const { return creation_flags_; }
   void set_creation_flags(int val) { creation_flags_ = val; }
 
-  const GURL& download_url() const { return download_url_; }
-  void set_download_url(const GURL& val) { download_url_ = val; }
-
   const base::FilePath& source_file() const { return source_file_; }
 
   Manifest::Location install_source() const {
     return install_source_;
   }
   void set_install_source(Manifest::Location source) {
     install_source_ = source;
   }
 
   const std::string& expected_id() const { return expected_id_; }
@@ skipping 13 matching lines @@
   bool is_gallery_install() const {
     return (creation_flags_ & Extension::FROM_WEBSTORE) > 0;
   }
   void set_is_gallery_install(bool val) {
     if (val)
       creation_flags_ |= Extension::FROM_WEBSTORE;
     else
       creation_flags_ &= ~Extension::FROM_WEBSTORE;
   }
 
-  // The original download URL should be set when the WebstoreInstaller is
-  // tracking the installation. The WebstoreInstaller uses this URL to match
-  // failure notifications to the extension.
-  const GURL& original_download_url() const { return original_download_url_; }
-  void set_original_download_url(const GURL& url) {
-    original_download_url_ = url;
-  }
+  // The download ID should be set when the WebstoreInstaller is tracking the
+  // installation. The WebstoreInstaller uses it to match events to the
+  // particular installation.
+  void set_download_id(uint32 download_id) { download_id_ = download_id; }
+  uint32 download_id() const { return download_id_; }
 
   // If |apps_require_extension_mime_type_| is set to true, be sure to set
   // |original_mime_type_| as well.
   void set_apps_require_extension_mime_type(
       bool apps_require_extension_mime_type) {
     apps_require_extension_mime_type_ = apps_require_extension_mime_type;
   }
 
   void set_original_mime_type(const std::string& original_mime_type) {
     original_mime_type_ = original_mime_type;
@@ skipping 140 matching lines @@
 
   // Whether manual extension installation is enabled. We can't just check this
   // before trying to install because themes are special-cased to always be
   // allowed.
   bool extensions_enabled_;
 
   // Whether we're supposed to delete the source file on destruction. Defaults
   // to false.
   bool delete_source_;
 
-  // The download URL, before redirects, if this is a gallery install.
-  GURL original_download_url_;
+  // The download ID, if this is a gallery install.
+  uint32 download_id_;

[not at google - send to devlin, 2014/04/07 16:51:40]

This needs to be initialised to something. Is there a value you can set it to
that guarantees it won't accidentally have a value of a real download ID?

 
   // Whether to create an app shortcut after successful installation. This is
   // set based on the user's selection in the UI and can only ever be true for
   // apps.
   bool create_app_shortcut_;
 
   // The ordinal of the NTP apps page |extension_| will be shown on.
   syncer::StringOrdinal page_ordinal_;
 
   // A parsed copy of the unmodified original manifest, before any
@@ skipping 78 matching lines @@
 
   // Gives access to common methods and data of an extension installer.
   ExtensionInstaller installer_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_