Allow extensions on chrome:// URLs, when flag is set and permission is explicitly requested

chrome/common/extensions/user_script.cc

Index: chrome/common/extensions/user_script.cc
diff --git a/chrome/common/extensions/user_script.cc b/chrome/common/extensions/user_script.cc
index dc62066c679348861e39773e63f3f14490108cbf..78c61349632245702d66682725d08934d1e24e1e 100644
--- a/chrome/common/extensions/user_script.cc
+++ b/chrome/common/extensions/user_script.cc
@@ -128,8 +128,8 @@ void UserScript::PickleURLPatternSet(::Pickle* pickle,
   pickle->WriteUInt64(pattern_list.patterns().size());
   for (URLPatternSet::const_iterator pattern = pattern_list.begin();
        pattern != pattern_list.end(); ++pattern) {
-    pickle->WriteInt(pattern->valid_schemes());
     pickle->WriteString(pattern->GetAsString());
+    pickle->WriteInt(pattern->valid_schemes());
   }
 }
 
@@ -182,22 +182,17 @@ void UserScript::UnpickleURLPatternSet(const ::Pickle& pickle,
 
   pattern_list->ClearPatterns();
   for (uint64 i = 0; i < num_patterns; ++i) {
-    int valid_schemes;
-    CHECK(pickle.ReadInt(iter, &valid_schemes));
     std::string pattern_str;
-    URLPattern pattern(valid_schemes);
+    URLPattern pattern(kValidUserScriptSchemes);
     CHECK(pickle.ReadString(iter, &pattern_str));
 
-    // We remove the file scheme if it's not actually allowed (see Extension::
-    // LoadUserScriptHelper), but we need it temporarily while loading the
-    // pattern so that it's valid.
-    bool had_file_scheme = (valid_schemes & URLPattern::SCHEME_FILE) != 0;
-    if (!had_file_scheme)
-      pattern.SetValidSchemes(valid_schemes | URLPattern::SCHEME_FILE);
-    CHECK(URLPattern::PARSE_SUCCESS == pattern.Parse(pattern_str));
-    if (!had_file_scheme)
-      pattern.SetValidSchemes(valid_schemes);
+    URLPattern::ParseResult result = pattern.Parse(pattern_str);
+    CHECK(URLPattern::PARSE_SUCCESS == result) <<
+        URLPattern::GetParseResultString(result) << " " << pattern_str.c_str();
 
+    int valid_schemes;
+    CHECK(pickle.ReadInt(iter, &valid_schemes));
+    pattern.SetValidSchemes(valid_schemes);
     pattern_list->AddPattern(pattern);
   }
 }