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

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 32777)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -191,10 +191,6 @@
 // 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";