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

chrome/browser/extensions/extension_browsertest.cc

Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 46a4495e650e8301e14ff115c706bcece1d440cb..f57284ffb3d4bb7a6d179651270c5e71a0017953 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -376,7 +376,7 @@ const Extension* ExtensionBrowserTest::UpdateExtensionWaitForIdle(
                                   Manifest::INTERNAL,
                                   browser(),
                                   Extension::NO_FLAGS,
-                                  true,
+                                  false,
                                   false);
 }
 
@@ -390,7 +390,7 @@ const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore(
                                   Manifest::INTERNAL,
                                   browser(),
                                   Extension::FROM_WEBSTORE,
-                                  false,
+                                  true,
                                   false);
 }
 
@@ -399,8 +399,15 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     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(
@@ -410,9 +417,15 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     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(
@@ -421,8 +434,15 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     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(
@@ -433,7 +453,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     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);
@@ -465,7 +485,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     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(