Create CrxInstaller directly in WebstoreInstaller

chrome/browser/extensions/webstore_installer.cc

 // 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.
 
 #include "chrome/browser/extensions/webstore_installer.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 319 matching lines @@
 
 void WebstoreInstaller::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_CRX_INSTALLER_DONE: {
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
       CrxInstaller* installer = content::Source<CrxInstaller>(source).ptr();
       if (extension == NULL && download_item_ != NULL &&
-          installer->download_url() == download_item_->GetURL() &&
+          installer->download_id() == download_item_->GetId() &&
           installer->profile()->IsSameProfile(profile_)) {
         ReportFailure(kInstallCanceledError, FAILURE_REASON_CANCELLED);
       }
       break;
     }
 
     case chrome::NOTIFICATION_EXTENSION_INSTALLED: {
       CHECK(profile_->IsSameProfile(content::Source<Profile>(source).ptr()));
       const Extension* extension =
           content::Details<const InstalledExtensionInfo>(details)->extension;
@@ skipping 31 matching lines @@
       CrxInstaller* crx_installer = content::Source<CrxInstaller>(source).ptr();
       CHECK(crx_installer);
       if (!profile_->IsSameProfile(crx_installer->profile()))
         return;
 
       // TODO(rdevlin.cronin): Continue removing std::string errors and
       // replacing with base::string16. See crbug.com/71980.
       const base::string16* error =
           content::Details<const base::string16>(details).ptr();
       const std::string utf8_error = base::UTF16ToUTF8(*error);
-      if (download_url_ == crx_installer->original_download_url())
+      if (download_item_->GetId() == crx_installer->download_id())
         ReportFailure(utf8_error, FAILURE_REASON_OTHER);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 void WebstoreInstaller::InvalidateDelegate() {
@@ skipping 290 matching lines @@
         1,
         kMaxSizeKb,
         kNumBuckets);
   }
   UMA_HISTOGRAM_BOOLEAN(
       "Extensions.WebstoreDownload.InterruptTotalSizeUnknown",
       total_bytes <= 0);
 }
 
 }  // namespace extensions