diff options
| author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 00:19:45 +0000 |
|---|---|---|
| committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 00:19:45 +0000 |
| commit | 2e32e6d77d464c19c2db8511737aa6be46b5829d (patch) | |
| tree | 362d5f846e6ca1e56f8094ddca784a09c15e8fc6 /chrome/browser/extensions | |
| parent | d2a9612a34f1acca05e72fbfe33f8da4b597f3f5 (diff) | |
| download | chromium_src-2e32e6d77d464c19c2db8511737aa6be46b5829d.zip chromium_src-2e32e6d77d464c19c2db8511737aa6be46b5829d.tar.gz chromium_src-2e32e6d77d464c19c2db8511737aa6be46b5829d.tar.bz2 | |
Fix issues related to <all_urls> in extensions.
This fixes the order effective host permissions are initialized in ExtensionPermissionSet. This also fixes an issue in URLPattern where the the pattern for <all_urls> differs depending on if you make the pattern by parsing <all_urls> or by calling SetMatchAllURLs.
BUG=98418
TEST=ExtensionApiTest.CrossOriginXHR*
Review URL: http://codereview.chromium.org/8138004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/cross_origin_xhr_apitest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_browsertest.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc index ed6d601..43fa257 100644 --- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc +++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc @@ -11,6 +11,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRBackgroundPage) { ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/background_page")) << message_; } +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRAllURLs) { + host_resolver()->AddRule("*.com", "127.0.0.1"); + ASSERT_TRUE(StartTestServer()); + ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/all_urls")) << message_; +} + // Flaky on the trybots. See http://crbug.com/96725. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_CrossOriginXHRContentScript) { host_resolver()->AddRule("*.com", "127.0.0.1"); diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 0121824..14d17d3 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -66,7 +66,7 @@ const Extension* ExtensionBrowserTest::LoadExtensionWithOptions( NotificationRegistrar registrar; registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, NotificationService::AllSources()); - service->LoadExtension(path); + service->LoadExtension(path, false); ui_test_utils::RunMessageLoop(); } |