Remove extraneous uses of the --enable-user-script

switch. It's better to check this at one chokepoint
(initialization) and let the rest of the code work
the same, but end up as no-ops.

Review URL: http://codereview.chromium.org/18401

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8793 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 15 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index c8b8e6e..1e1db05 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -267,7 +267,6 @@ bool BrowserRenderProcessHost::Init() {
     switches::kDisablePopupBlocking,
     switches::kUseLowFragHeapCrt,
     switches::kGearsInRenderer,
-    switches::kEnableUserScripts,
     switches::kEnableVideo,
   };
 
@@ -515,21 +514,8 @@ void BrowserRenderProcessHost::InitVisitedLinks() {
 }
 
 void BrowserRenderProcessHost::InitUserScripts() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableUserScripts)) {
-    return;
-  }
-
-  // TODO(aa): Figure out lifetime and ownership of this object
-  // - VisitedLinkMaster is owned by Profile, but there has been talk of
-  //   having scripts live elsewhere besides the profile.
-  // - File IO should be asynchronous (see VisitedLinkMaster), but how do we
-  //   get scripts to the first renderer without blocking startup? Should we
-  //   cache some information across restarts?
   UserScriptMaster* user_script_master = profile()->GetUserScriptMaster();
-  if (!user_script_master) {
-    return;
-  }
+  DCHECK(user_script_master);
 
   if (!user_script_master->ScriptsReady()) {
     // No scripts ready.  :(