Fix broken ExtensionCrxInstallerTest.GalleryInstallGetsExperimental test.

chrome/browser/extensions/crx_installer_browsertest.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 "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 class SkBitmap;
 
 namespace {
 
 class MockInstallUI : public ExtensionInstallUI {
  public:
   explicit MockInstallUI(Profile* profile) :
       ExtensionInstallUI(profile), confirmation_requested_(false) {}
@@ skipping 49 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, Whitelisting) {
 #if !defined(OS_CHROMEOS)
   // An extension with NPAPI should give a prompt.
   EXPECT_TRUE(DidWhitelistInstallPrompt("uitest/plugins.crx",
                                         "hdgllgikmikobbofgnabhfimcfoopgnd"));
 #endif  // !defined(OS_CHROMEOS)
 }
 
 // crbug.com/105728: Fails because the CRX is invalid.
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest,
-                       FAILS_GalleryInstallGetsExperimental) {
-  ASSERT_FALSE(InstallExtension(
-      test_data_dir_.AppendASCII("experimental.crx"), 0));
-  ASSERT_TRUE(InstallExtensionFromWebstore(
-      test_data_dir_.AppendASCII("experimental.crx"), 1));
+                       GalleryInstallGetsExperimental) {
+  // We must modify the command line temporarily in order to pack an extension
+  // that requests the experimental permission.
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  CommandLine old_command_line = *command_line;
+  command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+  FilePath crx_path = PackExtension(
+      test_data_dir_.AppendASCII("experimental"));
+  ASSERT_FALSE(crx_path.empty());
+
+  // Now reset the command line so that we are testing specifically whether
+  // installing from webstore enables experimental permissions.
+  *(CommandLine::ForCurrentProcess()) = old_command_line;
+
+  EXPECT_FALSE(InstallExtension(crx_path, 0));
+  EXPECT_TRUE(InstallExtensionFromWebstore(crx_path, 1));
 }