Merge 32770 - Revert change that disallowed content scripts access to...

chrome/common/chrome_switches.cc

 // Copyright (c) 2009 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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 
 namespace switches {
 
@@ skipping 173 matching lines @@
 // Enable experimental timeline API.
 const char kEnableExtensionTimelineApi[]    = "enable-extension-timeline-api";
 
 // Enable the fastback page cache.
 const char kEnableFastback[]                = "enable-fastback";
 
 // By default, cookies are not allowed on file://. They are needed for
 // testing, for example page cycler and layout tests.  See bug 1157243.
 const char kEnableFileCookies[]             = "enable-file-cookies";
 
-// By default, js content scripts are not allowed on file://. They are needed
-// for page cycler tests.  See http://crbug.com/27877.
-const char kEnableJsOnFileUrls[]         = "enable-content-script-on-file-urls";
-
 // Disable LocalStorage.
 const char kDisableLocalStorage[]            = "disable-local-storage";
 
 // Force logging to be enabled.  Logging is disabled by default in release
 // builds.
 const char kEnableLogging[]                 = "enable-logging";
 
 // On Windows, converts the page to the currently-installed monitor profile.
 // This does NOT enable color management for images. The source is still
 // assumed to be sRGB.
@@ skipping 498 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches