Cleanup: Make ExtensionService::OnExtensionInstalled take a bitmask instead of

chrome/browser/extensions/extension_browsertest.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/extension_browsertest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 358 matching lines @@
     const std::string& id,
     const base::FilePath& path,
     int expected_change) {
   return InstallOrUpdateExtension(id,
                                   path,
                                   INSTALL_UI_TYPE_NONE,
                                   expected_change,
                                   Manifest::INTERNAL,
                                   browser(),
                                   Extension::NO_FLAGS,
-                                  true,
+                                  false,
                                   false);
 }
 
 const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore(
     const base::FilePath& path,
     int expected_change) {
   return InstallOrUpdateExtension(std::string(),
                                   path,
                                   INSTALL_UI_TYPE_NONE,
                                   expected_change,
                                   Manifest::INTERNAL,
                                   browser(),
                                   Extension::FROM_WEBSTORE,
-                                  false,
+                                  true,
                                   false);
 }
 
 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     const std::string& id,
     const base::FilePath& path,
     InstallUIType ui_type,
     int expected_change) {
-  return InstallOrUpdateExtension(id, path, ui_type, expected_change,
-      Manifest::INTERNAL, browser(), Extension::NO_FLAGS, false, false);
+  return InstallOrUpdateExtension(id,
+                                  path,
+                                  ui_type,
+                                  expected_change,
+                                  Manifest::INTERNAL,
+                                  browser(),
+                                  Extension::NO_FLAGS,
+                                  true,
+                                  false);
 }
 
 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     const std::string& id,
     const base::FilePath& path,
     InstallUIType ui_type,
     int expected_change,
     Browser* browser,
     Extension::InitFromValueFlags creation_flags) {
-  return InstallOrUpdateExtension(id, path, ui_type, expected_change,
-                                  Manifest::INTERNAL, browser, creation_flags,
-                                  false, false);
+  return InstallOrUpdateExtension(id,
+                                  path,
+                                  ui_type,
+                                  expected_change,
+                                  Manifest::INTERNAL,
+                                  browser,
+                                  creation_flags,
+                                  true,
+                                  false);
 }
 
 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     const std::string& id,
     const base::FilePath& path,
     InstallUIType ui_type,
     int expected_change,
     Manifest::Location install_source) {
-  return InstallOrUpdateExtension(id, path, ui_type, expected_change,
-      install_source, browser(), Extension::NO_FLAGS, false, false);
+  return InstallOrUpdateExtension(id,
+                                  path,
+                                  ui_type,
+                                  expected_change,
+                                  install_source,
+                                  browser(),
+                                  Extension::NO_FLAGS,
+                                  true,
+                                  false);
 }
 
 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     const std::string& id,
     const base::FilePath& path,
     InstallUIType ui_type,
     int expected_change,
     Manifest::Location install_source,
     Browser* browser,
     Extension::InitFromValueFlags creation_flags,
-    bool wait_for_idle,
+    bool install_immediately,
     bool is_ephemeral) {
   ExtensionService* service = profile()->GetExtensionService();
   service->set_show_extensions_prompts(false);
   size_t num_before = service->extensions()->size();
 
   {
     scoped_ptr<ExtensionInstallPrompt> install_ui;
     if (ui_type == INSTALL_UI_TYPE_CANCEL) {
       install_ui.reset(new MockAbortExtensionInstallPrompt());
     } else if (ui_type == INSTALL_UI_TYPE_NORMAL) {
@@ skipping 11 matching lines @@
       crx_path = PackExtension(path);
     }
     if (crx_path.empty())
       return NULL;
 
     scoped_refptr<extensions::CrxInstaller> installer(
         extensions::CrxInstaller::Create(service, install_ui.Pass()));
     installer->set_expected_id(id);
     installer->set_creation_flags(creation_flags);
     installer->set_install_source(install_source);
-    installer->set_install_wait_for_idle(wait_for_idle);
+    installer->set_install_immediately(install_immediately);
     installer->set_is_ephemeral(is_ephemeral);
     if (!installer->is_gallery_install()) {
       installer->set_off_store_install_allow_reason(
           extensions::CrxInstaller::OffStoreInstallAllowedInTest);
     }
 
     observer_->Watch(
         chrome::NOTIFICATION_CRX_INSTALLER_DONE,
         content::Source<extensions::CrxInstaller>(installer.get()));
 
@@ skipping 141 matching lines @@
   return extensions::browsertest_util::ExecuteScriptInBackgroundPage(
       profile(), extension_id, script);
 }
 
 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait(
     const std::string& extension_id,
     const std::string& script) {
   return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait(
       profile(), extension_id, script);
 }