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

chrome/browser/profile.cc

 // Copyright (c) 2006-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 "chrome/browser/profile.h"
 
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 129 matching lines @@
 // static
 void Profile::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSearchSuggestEnabled, true);
   prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
   prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, true);
   // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
   prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary,
       IDS_SPELLCHECK_DICTIONARY);
   prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, true);
   prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, true);
-  prefs->RegisterBooleanPref(prefs::kEnableUserScripts, false);
 #if defined(OS_LINUX)
   prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, false);
 #endif
   prefs->RegisterStringPref(prefs::kCurrentThemeID,
                             UTF8ToWide(BrowserThemeProvider::kDefaultThemeID));
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties);
   prefs->RegisterBooleanPref(prefs::kDisableExtensions, false);
@@ skipping 511 matching lines @@
   chromeos_preferences_.Init(prefs);
 #endif
 }
 
 void ProfileImpl::InitExtensions() {
   if (user_script_master_ || extensions_service_)
     return;  // Already initialized.
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   PrefService* prefs = GetPrefs();
-  bool user_scripts_enabled =
-      command_line->HasSwitch(switches::kEnableUserScripts) ||
-      prefs->GetBoolean(prefs::kEnableUserScripts);
-
-  FilePath script_dir;
-  if (user_scripts_enabled) {
-    if (command_line->HasSwitch(switches::kUserScriptsDir)) {
-      std::wstring path_string =
-          command_line->GetSwitchValue(switches::kUserScriptsDir);
-      script_dir = FilePath::FromWStringHack(path_string);
-    } else {
-      script_dir = GetPath();
-      script_dir = script_dir.Append(chrome::kUserScriptsDirname);
-    }
-  }
 
   ExtensionErrorReporter::Init(true);  // allow noisy errors.
+
+  FilePath script_dir;  // Don't look for user scripts in any directory.
+                        // TODO(aa): We should just remove this functionality,
+                        // since it isn't used anymore.
   user_script_master_ = new UserScriptMaster(script_dir);
+
   extensions_service_ = new ExtensionsService(
       this,
       CommandLine::ForCurrentProcess(),
       GetPrefs(),
       GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName),
       true);
 
   extensions_service_->Init();
 
   // Load any extensions specified with --load-extension.
@@ skipping 737 matching lines @@
   }
   if (!sync_service_.get())
     InitSyncService();
   return sync_service_.get();
 }
 
 void ProfileImpl::InitSyncService() {
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 }