Update WebstoreInstaller to be ref counted.

chrome/browser/extensions/webstore_inline_installer.cc

 // 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.
 
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/string_util.h"
@@ skipping 288 matching lines @@
       CompleteInstall(kNotFromVerifiedSiteError);
       return;
     }
   } else {
     CompleteInstall(kNoVerifiedSiteError);
     return;
   }
 
   scoped_refptr<WebstoreInstallHelper> helper = new WebstoreInstallHelper(
       this,
+      id_,
       manifest,
       "", // We don't have any icon data.
       icon_url,
       Profile::FromBrowserContext(tab_contents()->browser_context())->
           GetRequestContext());
   // The helper will call us back via OnWebstoreParseSucces or
   // OnWebstoreParseFailure.
   helper->Start();
 }
 
 void WebstoreInlineInstaller::OnWebstoreResponseParseFailure(
     const std::string& error) {
   CompleteInstall(error);
 }
 
 void WebstoreInlineInstaller::OnWebstoreParseSuccess(
+    const std::string& id,
     const SkBitmap& icon,
     base::DictionaryValue* manifest) {
   // Check if the tab has gone away in the meantime.
   if (!tab_contents()) {
     CompleteInstall("");
     return;
   }
 
+  CHECK_EQ(id_, id);
   manifest_.reset(manifest);
   icon_ = icon;
 
   Profile* profile = Profile::FromBrowserContext(
       tab_contents()->browser_context());
 
   ExtensionInstallUI::Prompt prompt(ExtensionInstallUI::INLINE_INSTALL_PROMPT);
   prompt.SetInlineInstallWebstoreData(localized_user_count_,
                                       average_rating_,
                                       rating_count_);
 
   if (!ShowExtensionInstallDialogForManifest(profile,
                                              this,
                                              manifest,
                                              id_,
                                              localized_name_,
                                              localized_description_,
                                              &icon_,
                                              prompt,
                                              &dummy_extension_)) {
     CompleteInstall(kInvalidManifestError);
     return;
   }
 
   // Control flow finishes up in InstallUIProceed or InstallUIAbort.
 }
 
 void WebstoreInlineInstaller::OnWebstoreParseFailure(
+    const std::string& id,
     InstallHelperResultCode result_code,
     const std::string& error_message) {
   CompleteInstall(error_message);
 }
 
 void WebstoreInlineInstaller::InstallUIProceed() {
   // Check if the tab has gone away in the meantime.
   if (!tab_contents()) {
     CompleteInstall("");
     return;
   }
 
   CrxInstaller::WhitelistEntry* entry = new CrxInstaller::WhitelistEntry;
 
   entry->parsed_manifest.reset(manifest_.get()->DeepCopy());
   entry->localized_name = localized_name_;
   entry->use_app_installed_bubble = true;
   CrxInstaller::SetWhitelistEntry(id_, entry);
 
   Profile* profile = Profile::FromBrowserContext(
       tab_contents()->browser_context());
 
-  WebstoreInstaller* installer =
-      profile->GetExtensionService()->webstore_installer();
-  installer->InstallExtension(
-      id_, this, WebstoreInstaller::FLAG_INLINE_INSTALL);
+  scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller(
+      profile, this, &(tab_contents()->controller()), id_,
+      WebstoreInstaller::FLAG_INLINE_INSTALL);
+  installer->Start();
 }
 
 void WebstoreInlineInstaller::InstallUIAbort(bool user_initiated) {
   CompleteInstall(kUserCancelledError);
 }
 
 void WebstoreInlineInstaller::TabContentsDestroyed(TabContents* tab_contents) {
   // Abort any in-progress fetches.
   if (webstore_data_url_fetcher_.get()) {
     webstore_data_url_fetcher_.reset();
@@ skipping 18 matching lines @@
   if (tab_contents()) {
     if (error.empty()) {
       delegate_->OnInlineInstallSuccess(install_id_);
     } else {
       delegate_->OnInlineInstallFailure(install_id_, error);
     }
   }
 
   Release(); // Matches the AddRef in BeginInstall.
 }