Revert 195143 "Prevent chrome.app JSON schema from loading on ev..."

trunk/src/chrome/common/extensions/api/extension_api_unittest.cc

 // Copyright (c) 2012 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/api/extension_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 154 matching lines @@
     { "test1", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() },
     { "test1", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
     { "test2", true, Feature::WEB_PAGE_CONTEXT, GURL("http://google.com") },
     { "test2", false, Feature::BLESSED_EXTENSION_CONTEXT,
         GURL("http://google.com") },
     { "test2.foo", false, Feature::WEB_PAGE_CONTEXT,
         GURL("http://google.com") },
     { "test2.foo", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
     { "test3", false, Feature::WEB_PAGE_CONTEXT, GURL("http://google.com") },
     { "test3.foo", true, Feature::WEB_PAGE_CONTEXT, GURL("http://google.com") },
-    { "test3.foo", true, Feature::BLESSED_EXTENSION_CONTEXT,
-        GURL("http://bad.com") },
-    { "test4", true, Feature::BLESSED_EXTENSION_CONTEXT,
-        GURL("http://bad.com") },
-    { "test4.foo", false, Feature::BLESSED_EXTENSION_CONTEXT,
-        GURL("http://bad.com") },
-    { "test4.foo", false, Feature::UNBLESSED_EXTENSION_CONTEXT,
-        GURL("http://bad.com") },
+    { "test3.foo", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
+    { "test4", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
+    { "test4.foo", false, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
+    { "test4.foo", false, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() },
     { "test4.foo.foo", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
     { "test5", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
     { "test5", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") },
     { "test5.blah", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
     { "test5.blah", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") },
     { "test6", false, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
     { "test6.foo", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
     { "test7", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
     { "test7.foo", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") },
     { "test7.foo", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
@@ skipping 184 matching lines @@
 }
 
 TEST_F(ExtensionAPITest, URLMatching) {
   scoped_ptr<ExtensionAPI> api(ExtensionAPI::CreateWithDefaultConfiguration());
 
   // "app" API is available to all URLs that content scripts can be injected.
   EXPECT_TRUE(MatchesURL(api.get(), "app", "http://example.com/example.html"));
   EXPECT_TRUE(MatchesURL(api.get(), "app", "https://blah.net"));
   EXPECT_TRUE(MatchesURL(api.get(), "app", "file://somefile.html"));
 
-  // But not internal URLs.
+  // But not internal URLs (for chrome-extension:// the app API is injected by
+  // GetSchemasForExtension).
   EXPECT_FALSE(MatchesURL(api.get(), "app", "about:flags"));
   EXPECT_FALSE(MatchesURL(api.get(), "app", "chrome://flags"));
-
-  // "app" should be available to chrome-extension URLs.
-  EXPECT_TRUE(MatchesURL(api.get(), "app",
+  EXPECT_FALSE(MatchesURL(api.get(), "app",
                           "chrome-extension://fakeextension"));
 
   // "storage" API (for example) isn't available to any URLs.
   EXPECT_FALSE(MatchesURL(api.get(), "storage",
                           "http://example.com/example.html"));
   EXPECT_FALSE(MatchesURL(api.get(), "storage", "https://blah.net"));
   EXPECT_FALSE(MatchesURL(api.get(), "storage", "file://somefile.html"));
   EXPECT_FALSE(MatchesURL(api.get(), "storage", "about:flags"));
   EXPECT_FALSE(MatchesURL(api.get(), "storage", "chrome://flags"));
   EXPECT_FALSE(MatchesURL(api.get(), "storage",
@@ skipping 154 matching lines @@
   GetDictionaryFromList(dict, "parameters", 0, &sub_dict);
   EXPECT_TRUE(sub_dict->GetString("$ref", &type));
   EXPECT_EQ("test.foo.TestType", type);
   GetDictionaryFromList(dict, "parameters", 1, &sub_dict);
   EXPECT_TRUE(sub_dict->GetString("$ref", &type));
   EXPECT_EQ("fully.qualified.Type", type);
 }
 
 }  // namespace
 }  // namespace extensions