Fix some issues with extensions:

chrome/common/extensions/user_script_unittest.cc

 // Copyright (c) 2009 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 "base/file_path.h"
 #include "base/pickle.h"
 #include "chrome/common/extensions/user_script.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+static const int kAllSchemes =
+    URLPattern::SCHEME_HTTP |
+    URLPattern::SCHEME_HTTPS |
+    URLPattern::SCHEME_FILE |
+    URLPattern::SCHEME_FTP |
+    URLPattern::SCHEME_CHROMEUI;
+
 TEST(UserScriptTest, Match1) {
   UserScript script;
   script.add_glob("*mail.google.com*");
   script.add_glob("*mail.yahoo.com*");
   script.add_glob("*mail.msn.com*");
   EXPECT_TRUE(script.MatchesUrl(GURL("http://mail.google.com")));
   EXPECT_TRUE(script.MatchesUrl(GURL("http://mail.google.com/foo")));
   EXPECT_TRUE(script.MatchesUrl(GURL("https://mail.google.com/foo")));
   EXPECT_TRUE(script.MatchesUrl(GURL("ftp://mail.google.com/foo")));
   EXPECT_TRUE(script.MatchesUrl(GURL("http://woo.mail.google.com/foo")));
@@ skipping 35 matching lines @@
 
 TEST(UserScriptTest, Match5) {
   UserScript script;
   script.add_glob("*foo*");
   EXPECT_TRUE(script.MatchesUrl(GURL("http://foo.com/bar")));
   EXPECT_TRUE(script.MatchesUrl(GURL("http://baz.org/foo/bar")));
   EXPECT_FALSE(script.MatchesUrl(GURL("http://baz.org")));
 }
 
 TEST(UserScriptTest, Match6) {
-  URLPattern pattern(URLPattern::SCHEMES_ALL);
+  URLPattern pattern(kAllSchemes);
   ASSERT_TRUE(pattern.Parse("http://*/foo*"));
 
   UserScript script;
   script.add_url_pattern(pattern);
   EXPECT_TRUE(script.MatchesUrl(GURL("http://monkey.com/foobar")));
   EXPECT_FALSE(script.MatchesUrl(GURL("http://monkey.com/hotdog")));
 
   // NOTE: URLPattern is tested more extensively in url_pattern_unittest.cc.
 }
 
 TEST(UserScriptTest, UrlPatternGlobInteraction) {
   // If there are both, match intersection(union(globs), union(urlpatterns)).
   UserScript script;
   
-  URLPattern pattern(URLPattern::SCHEMES_ALL);
+  URLPattern pattern(kAllSchemes);
   ASSERT_TRUE(pattern.Parse("http://www.google.com/*"));
   script.add_url_pattern(pattern);
 
   script.add_glob("*bar*");
 
   // No match, because it doesn't match the glob.
   EXPECT_FALSE(script.MatchesUrl(GURL("http://www.google.com/foo")));
 
   script.add_exclude_glob("*baz*");
 
   // No match, because it matches the exclude glob.
   EXPECT_FALSE(script.MatchesUrl(GURL("http://www.google.com/baz")));
 
   // Match, because it matches the glob, doesn't match the exclude glob.
   EXPECT_TRUE(script.MatchesUrl(GURL("http://www.google.com/bar")));
 
   // Try with just a single exclude glob.
   script.clear_globs();
   EXPECT_TRUE(script.MatchesUrl(GURL("http://www.google.com/foo")));
 
   // Try with no globs or exclude globs.
   script.clear_exclude_globs();
   EXPECT_TRUE(script.MatchesUrl(GURL("http://www.google.com/foo")));
 }
 
 TEST(UserScriptTest, Pickle) {
-  URLPattern pattern1(URLPattern::SCHEMES_ALL);
-  URLPattern pattern2(URLPattern::SCHEMES_ALL);
+  URLPattern pattern1(kAllSchemes);
+  URLPattern pattern2(kAllSchemes);
   ASSERT_TRUE(pattern1.Parse("http://*/foo*"));
   ASSERT_TRUE(pattern2.Parse("http://bar/baz*"));
 
   UserScript script1;
   script1.js_scripts().push_back(UserScript::File(
       FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
       FilePath(FILE_PATH_LITERAL("foo.user.js")),
       GURL("chrome-user-script:/foo.user.js")));
   script1.css_scripts().push_back(UserScript::File(
       FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
@@ skipping 31 matching lines @@
   for (size_t i = 0; i < script1.url_patterns().size(); ++i) {
     EXPECT_EQ(script1.url_patterns()[i].GetAsString(),
               script2.url_patterns()[i].GetAsString());
   }
 }
 
 TEST(UserScriptTest, Defaults) {
   UserScript script;
   ASSERT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }