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

chrome/browser/extensions/extension_browsertest.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
 
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 134 matching lines @@
       const base::FilePath& path,
       int expected_change,
       extensions::Manifest::Location install_source) {
     return InstallOrUpdateExtension(std::string(),
                                     path,
                                     INSTALL_UI_TYPE_NONE,
                                     expected_change,
                                     install_source);
   }
 
+  // Installs an extension and grants it the permissions it requests.
+  // TODO(devlin): It seems like this is probably the desired outcome most of
+  // the time - otherwise the extension installs in a disabled state.
+  const extensions::Extension* InstallExtensionWithPermissionsGranted(
+      const base::FilePath& file_path,
+      int expected_change) {
+    return InstallOrUpdateExtension(
+        std::string(), file_path, INSTALL_UI_TYPE_NONE, expected_change,
+        extensions::Manifest::INTERNAL, browser(),
+        extensions::Extension::NO_FLAGS, false, true);
+  }
+
   // Installs extension as if it came from the Chrome Webstore.
   const extensions::Extension* InstallExtensionFromWebstore(
       const base::FilePath& path, int expected_change);
 
   // Same as above but passes an id to CrxInstaller and does not allow a
   // privilege increase.
   const extensions::Extension* UpdateExtension(const std::string& id,
                                                const base::FilePath& path,
                                                int expected_change) {
     return InstallOrUpdateExtension(id, path, INSTALL_UI_TYPE_NONE,
@@ skipping 23 matching lines @@
                                     expected_change,
                                     browser,
                                     extensions::Extension::NO_FLAGS);
   }
 
   const extensions::Extension* InstallExtensionWithSourceAndFlags(
       const base::FilePath& path,
       int expected_change,
       extensions::Manifest::Location install_source,
       extensions::Extension::InitFromValueFlags creation_flags) {
-    return InstallOrUpdateExtension(std::string(),
-                                    path,
-                                    INSTALL_UI_TYPE_NONE,
-                                    expected_change,
-                                    install_source,
-                                    browser(),
-                                    creation_flags,
-                                    false);
+    return InstallOrUpdateExtension(std::string(), path, INSTALL_UI_TYPE_NONE,
+                                    expected_change, install_source, browser(),
+                                    creation_flags, false, false);
   }
 
   // Begins install process but simulates a user cancel.
   const extensions::Extension* StartInstallButCancel(
       const base::FilePath& path) {
     return InstallOrUpdateExtension(
         std::string(), path, INSTALL_UI_TYPE_CANCEL, 0);
   }
 
   void ReloadExtension(const std::string& extension_id);
@@ skipping 136 matching lines @@
       int expected_change,
       extensions::Manifest::Location install_source);
   const extensions::Extension* InstallOrUpdateExtension(
       const std::string& id,
       const base::FilePath& path,
       InstallUIType ui_type,
       int expected_change,
       extensions::Manifest::Location install_source,
       Browser* browser,
       extensions::Extension::InitFromValueFlags creation_flags,
-      bool wait_for_idle);
+      bool wait_for_idle,
+      bool grant_permissions);
 
   // Make the current channel "dev" for the duration of the test.
   extensions::ScopedCurrentChannel current_channel_;
 
   // Disable external install UI.
   extensions::FeatureSwitch::ScopedOverride
       override_prompt_for_external_extensions_;
 
 #if defined(OS_WIN)
   // Use mock shortcut directories to ensure app shortcuts are cleaned up.
   base::ScopedPathOverride user_desktop_override_;
   base::ScopedPathOverride common_desktop_override_;
   base::ScopedPathOverride user_quick_launch_override_;
   base::ScopedPathOverride start_menu_override_;
   base::ScopedPathOverride common_start_menu_override_;
 #endif
 
   // The default profile to be used.
   Profile* profile_;
 
   // Cache cache implementation.
   std::unique_ptr<extensions::ExtensionCacheFake> test_extension_cache_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_