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

chrome/common/extensions/url_pattern.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/common/extensions/url_pattern.h"
 
 #include "base/string_piece.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
@@ skipping 211 matching lines @@
   if (!MatchesHost(test))
     return false;
 
   if (!MatchesPath(test.PathForRequest()))
     return false;
 
   return true;
 }
 
 bool URLPattern::MatchesScheme(const std::string& test) const {
-  if (scheme_ == "*")
-    return IsValidScheme(test);
+  if (!IsValidScheme(test))
+    return false;
 
-  return test == scheme_;
+  return scheme_ == "*" || test == scheme_;
 }
 
 bool URLPattern::MatchesHost(const std::string& host) const {
   std::string test(chrome::kHttpScheme);
   test += chrome::kStandardSchemeSeparator;
   test += host;
   test += "/";
   return MatchesHost(GURL(test));
 }
 
@@ skipping 79 matching lines @@
   if (!MatchesPath(other.path().substr(0, other.path().size() - 1)) &&
       !other.MatchesPath(path_.substr(0, path_.size() - 1)))
     return false;
 
   return true;
 }
 
 std::vector<URLPattern> URLPattern::ConvertToExplicitSchemes() const {
   std::vector<URLPattern> result;
 
-  if (scheme_ != "*" && !match_all_urls_) {
+  if (scheme_ != "*" && !match_all_urls_ && IsValidScheme(scheme_)) {
     result.push_back(*this);
     return result;
   }
 
   for (size_t i = 0; i < arraysize(kValidSchemes); ++i) {
     if (MatchesScheme(kValidSchemes[i])) {
       URLPattern temp = *this;
       temp.SetScheme(kValidSchemes[i]);
       temp.set_match_all_urls(false);
       result.push_back(temp);
     }
   }
 
   return result;
 }
 
 // static
 const char* URLPattern::GetParseResultString(
     URLPattern::ParseResult parse_result) {
   return kParseResultMessages[parse_result];
 }