Improve ExtensionBrowserTest. Part of moving ExtensionService to use ExtensionSet.

chrome/browser/extensions/crx_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/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 441 matching lines @@
       extension_, histogram_name.c_str());
 
   // Kill the theme loading bubble.
   content::NotificationService* service =
       content::NotificationService::current();
   service->Notify(chrome::NOTIFICATION_NO_THEME_DETECTED,
                   content::Source<CrxInstaller>(this),
                   content::NotificationService::NoDetails());
   Release();  // balanced in ConfirmInstall().
 
-  NotifyCrxInstallComplete();
+  NotifyCrxInstallComplete(NULL);
 
   // We're done. Since we don't post any more tasks to ourself, our ref count
   // should go to zero and we die. The destructor will clean up the temp dir.
 }
 
 void CrxInstaller::CompleteInstall() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!current_version_.empty()) {
     scoped_ptr<Version> current_version(
@@ skipping 60 matching lines @@
   // This isn't really necessary, it is only used because unit tests expect to
   // see errors get reported via this interface.
   //
   // TODO(aa): Need to go through unit tests and clean them up too, probably get
   // rid of this line.
   ExtensionErrorReporter::GetInstance()->ReportError(error, false);  // quiet
 
   if (client_)
     client_->OnInstallFailure(error);
 
-  NotifyCrxInstallComplete();
+  NotifyCrxInstallComplete(NULL);
 }
 
 void CrxInstaller::ReportSuccessFromFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Tracking number of extensions installed by users
   if (install_cause() == extension_misc::INSTALL_CAUSE_USER_DOWNLOAD) {
     UMA_HISTOGRAM_ENUMERATION("Extensions.ExtensionInstalled", 1, 2);
 
     static bool default_apps_trial_exists =
@@ skipping 26 matching lines @@
   // the install (client_ is non NULL), or we are allowed to install this
   // silently. We only track granted permissions for INTERNAL extensions.
   if ((client_ || allow_silent_install_) &&
       extension_->location() == Extension::INTERNAL)
     frontend_weak_->GrantPermissions(extension_);
 
   // Tell the frontend about the installation and hand off ownership of
   // extension_ to it.
   frontend_weak_->OnExtensionInstalled(extension_, is_gallery_install(),
                                        page_index_);
+
+  NotifyCrxInstallComplete(extension_.get());
+
   extension_ = NULL;
 
-  NotifyCrxInstallComplete();
-
   // We're done. We don't post any more tasks to ourselves so we are deleted
   // soon.
 }
 
-void CrxInstaller::NotifyCrxInstallComplete() {
+void CrxInstaller::NotifyCrxInstallComplete(const Extension* extension) {
   // Some users (such as the download shelf) need to know when a
   // CRXInstaller is done.  Listening for the EXTENSION_* events
   // is problematic because they don't know anything about the
-  // extension before it is unpacked, so they can not filter based
+  // extension before it is unpacked, so they cannot filter based
   // on the extension.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CRX_INSTALLER_DONE,
       content::Source<CrxInstaller>(this),
-      content::NotificationService::NoDetails());
+      content::Details<const Extension>(extension));
 }