Create CrxInstaller directly in WebstoreInstaller

chrome/browser/extensions/crx_installer.h

Index: chrome/browser/extensions/crx_installer.h
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 7facb81659e1ed0bd12037a9e4361866aaca0510..b353af0b4bd2dac5d148c87784534bf62c30bca2 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -110,9 +110,6 @@ class CrxInstaller
   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 {
@@ -146,13 +143,11 @@ class CrxInstaller
       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.
@@ -313,8 +308,8 @@ class CrxInstaller
   // 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