[Extensions] Fix a bug in the startup pages override bubble

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 <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 371 matching lines @@
     ADD_FAILURE() << crx_path.value() << " was not created.";
     return base::FilePath();
   }
   return crx_path;
 }
 
 const Extension* ExtensionBrowserTest::UpdateExtensionWaitForIdle(
     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,
-                                  false);
+  return InstallOrUpdateExtension(id, path, INSTALL_UI_TYPE_NONE,
+                                  expected_change, Manifest::INTERNAL,
+                                  browser(), Extension::NO_FLAGS, false, false);
 }
 
 const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore(
     const base::FilePath& path,
     int expected_change) {
   return InstallOrUpdateExtension(
       std::string(), path, INSTALL_UI_TYPE_AUTO_CONFIRM, expected_change,
-      Manifest::INTERNAL, browser(), Extension::FROM_WEBSTORE, true);
+      Manifest::INTERNAL, browser(), Extension::FROM_WEBSTORE, 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,
-                                  true);
+  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,
-                                  true);
+  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,
-                                  true);
+  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 install_immediately) {
+    bool install_immediately,
+    bool grant_permissions) {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile())->extension_service();
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
   service->set_show_extensions_prompts(false);
   size_t num_before = registry->enabled_extensions().size();
 
   {
     std::unique_ptr<ScopedTestDialogAutoConfirm> prompt_auto_confirm;
     if (ui_type == INSTALL_UI_TYPE_CANCEL) {
       prompt_auto_confirm.reset(new ScopedTestDialogAutoConfirm(
@@ skipping 19 matching lines @@
     if (prompt_auto_confirm) {
       install_ui.reset(new ExtensionInstallPrompt(
          browser->tab_strip_model()->GetActiveWebContents()));
     }
     scoped_refptr<extensions::CrxInstaller> installer(
         extensions::CrxInstaller::Create(service, std::move(install_ui)));
     installer->set_expected_id(id);
     installer->set_creation_flags(creation_flags);
     installer->set_install_source(install_source);
     installer->set_install_immediately(install_immediately);
+    installer->set_allow_silent_install(grant_permissions);
     if (!installer->is_gallery_install()) {
       installer->set_off_store_install_allow_reason(
           extensions::CrxInstaller::OffStoreInstallAllowedInTest);
     }
 
     observer_->Watch(
         extensions::NOTIFICATION_CRX_INSTALLER_DONE,
         content::Source<extensions::CrxInstaller>(installer.get()));
 
     installer->InstallCrx(crx_path);
@@ skipping 140 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);
 }