Make <all_urls> and file:///* in permissions trigger "Allow file access"

chrome/renderer/user_script_slave.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/renderer/user_script_slave.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/perftimer.h"
@@ skipping 132 matching lines @@
     UserScript* script = scripts_[i];
     if (script->css_scripts().empty())
       continue;
 
     WebVector<WebString> patterns;
     std::vector<WebString> temp_patterns;
     for (size_t k = 0; k < script->url_patterns().size(); ++k) {
       std::vector<URLPattern> explicit_patterns =
           script->url_patterns()[k].ConvertToExplicitSchemes();
       for (size_t m = 0; m < explicit_patterns.size(); ++m) {
-        // Only include file schemes if the user has opted into that.
-        if (!explicit_patterns[m].MatchesScheme(chrome::kFileScheme) ||
-            script->allow_file_access()) {
-          temp_patterns.push_back(WebString::fromUTF8(
-              explicit_patterns[m].GetAsString()));
-        }
+        temp_patterns.push_back(WebString::fromUTF8(
+            explicit_patterns[m].GetAsString()));
       }
     }
     patterns.assign(temp_patterns);
 
     for (size_t j = 0; j < script->css_scripts().size(); ++j) {
       const UserScript::File& file = scripts_[i]->css_scripts()[j];
       std::string content = file.GetContent().as_string();
 
        WebView::addUserStyleSheet(
           WebString::fromUTF8(content),
@@ skipping 37 matching lines @@
     const Extension* extension = extensions_->GetByID(script->extension_id());
 
     // Since extension info is sent separately from user script info, they can
     // be out of sync. We just ignore this situation.
     if (!extension)
       continue;
 
     if (!extension->CanExecuteScriptOnPage(frame_url, script, NULL))
       continue;
 
-    if (frame_url.SchemeIsFile() && !script->allow_file_access())
-      continue;  // This script isn't allowed to run on file URLs.
-
     // We rely on WebCore for CSS injection, but it's still useful to know how
     // many css files there are.
     if (location == UserScript::DOCUMENT_START)
       num_css += script->css_scripts().size();
 
     if (script->run_location() == location) {
       num_scripts += script->js_scripts().size();
       for (size_t j = 0; j < script->js_scripts().size(); ++j) {
         UserScript::File &file = script->js_scripts()[j];
         std::string content = file.GetContent().as_string();
@@ skipping 45 matching lines @@
     if (num_scripts)
       UMA_HISTOGRAM_TIMES("Extensions.InjectEnd_Time", timer.Elapsed());
   } else if (location == UserScript::DOCUMENT_IDLE) {
     UMA_HISTOGRAM_COUNTS_100("Extensions.InjectIdle_ScriptCount", num_scripts);
     if (num_scripts)
       UMA_HISTOGRAM_TIMES("Extensions.InjectIdle_Time", timer.Elapsed());
   } else {
     NOTREACHED();
   }
 }