Remove --enable-user-script and associated tests.

chrome/browser/extensions/extension_startup_unittest.cc

 // Copyright (c) 2008 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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 12 matching lines @@
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/net_util.h"
 
 // This file contains high-level startup tests for the extensions system. We've
 // had many silly bugs where command line flags did not get propagated correctly
 // into the services, so we didn't start correctly.
 
 class ExtensionStartupTestBase
   : public InProcessBrowserTest, public NotificationObserver {
  public:
-  ExtensionStartupTestBase()
-      : enable_extensions_(false), enable_user_scripts_(false) {
+  ExtensionStartupTestBase() : enable_extensions_(false) {
   }
 
  protected:
   // InProcessBrowserTest
   virtual void SetUpCommandLine(CommandLine* command_line) {
     EnableDOMAutomation();
 
     FilePath profile_dir;
     PathService::Get(chrome::DIR_USER_DATA, &profile_dir);
     profile_dir = profile_dir.AppendASCII("Default");
     file_util::CreateDirectory(profile_dir);
 
     preferences_file_ = profile_dir.AppendASCII("Preferences");
     user_scripts_dir_ = profile_dir.AppendASCII("User Scripts");
     extensions_dir_ = profile_dir.AppendASCII("Extensions");
 
     if (enable_extensions_) {
       FilePath src_dir;
       PathService::Get(chrome::DIR_TEST_DATA, &src_dir);
       src_dir = src_dir.AppendASCII("extensions").AppendASCII("good");
 
       file_util::CopyFile(src_dir.AppendASCII("Preferences"),
                           preferences_file_);
       file_util::CopyDirectory(src_dir.AppendASCII("Extensions"),
                                profile_dir, true);  // recursive
     } else {
       command_line->AppendSwitch(switches::kDisableExtensions);
     }
 
-    if (enable_user_scripts_) {
-      command_line->AppendSwitch(switches::kEnableUserScripts);
-
-      FilePath src_dir;
-      PathService::Get(chrome::DIR_TEST_DATA, &src_dir);
-      src_dir = src_dir.AppendASCII("extensions").AppendASCII("good")
-                       .AppendASCII("Extensions")
-                       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
-                       .AppendASCII("1.0.0.0");
-
-      file_util::CreateDirectory(user_scripts_dir_);
-      file_util::CopyFile(src_dir.AppendASCII("script2.js"),
-                          user_scripts_dir_.AppendASCII("script2.user.js"));
-    }
-
     if (!load_extension_.value().empty()) {
       command_line->AppendSwitchWithValue(switches::kLoadExtension,
                                           load_extension_.ToWStringHack());
     }
   }
 
   // NotificationObserver
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
@@ skipping 60 matching lines @@
         browser()->GetSelectedTabContents()->render_view_host(), L"",
         L"window.domAutomationController.send(document.title == 'Modified')",
         &result);
     EXPECT_EQ(expect_script, result);
   }
 
   FilePath preferences_file_;
   FilePath extensions_dir_;
   FilePath user_scripts_dir_;
   bool enable_extensions_;
-  bool enable_user_scripts_;
   FilePath load_extension_;
   NotificationRegistrar registrar_;
 };
 
 
 // ExtensionsStartupTest
 // Ensures that we can startup the browser with --enable-extensions and some
 // extensions installed and see them run and do basic things.
 
 class ExtensionsStartupTest : public ExtensionStartupTestBase {
@@ skipping 24 matching lines @@
         .AppendASCII("Extensions")
         .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
         .AppendASCII("1.0.0.0");
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) {
   WaitForServicesToStart(1, false);
   TestInjection(true, true);
 }
-
-
-// ExtensionsStartupUserScriptTest
-// Tests that we can startup with --enable-user-scripts and run user scripts and
-// see them do basic things.
-
-class ExtensionsStartupUserScriptTest : public ExtensionStartupTestBase {
- public:
-  ExtensionsStartupUserScriptTest() {
-    enable_user_scripts_ = true;
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(ExtensionsStartupUserScriptTest, Test) {
-  WaitForServicesToStart(0, false);
-  TestInjection(false, true);
-}
-
-// Ensure we don't inject into chrome:// URLs
-IN_PROC_BROWSER_TEST_F(ExtensionsStartupUserScriptTest, NoInjectIntoChrome) {
-  WaitForServicesToStart(0, false);
-
-  ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
-
-  bool result = false;
-  ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedTabContents()->render_view_host(), L"",
-      L"window.domAutomationController.send(document.title == 'Modified')",
-      &result);
-  EXPECT_FALSE(result);
-}