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

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc	(revision 32777)
+++ chrome/common/extensions/extension.cc	(working copy)
@@ -244,20 +244,11 @@
           IntToString(definition_index), IntToString(j));
       return false;
     }
-    std::string scheme = pattern.scheme();
-    if (scheme == "file") {
-      // No content scripts are allowed unless the command line override switch
-      // was provided.
-      if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableJsOnFileUrls)) {
-        continue;
-      }
-    }
 
     result->add_url_pattern(pattern);
   }
 
-  // Include/exclude globs (mostly for Greasemonkey compatibility).
+  // include/exclude globs (mostly for Greasemonkey compat)
   if (!LoadGlobsHelper(content_script, definition_index, keys::kIncludeGlobs,
                        error, &UserScript::add_glob, result)) {
       return false;
@@ -268,7 +259,7 @@
       return false;
   }
 
-  // js and css keys.
+  // js and css keys
   ListValue* js = NULL;
   if (content_script->HasKey(keys::kJs) &&
       !content_script->GetList(keys::kJs, &js)) {