diff options
| -rw-r--r-- | chrome/browser/extensions/all_urls_apitest.cc | 29 | ||||
| -rw-r--r-- | chrome/common/extensions/extension.cc | 18 | ||||
| -rw-r--r-- | chrome/common/extensions/extension.h | 3 |
3 files changed, 45 insertions, 5 deletions
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc index bfdaab4..52eb048 100644 --- a/chrome/browser/extensions/all_urls_apitest.cc +++ b/chrome/browser/extensions/all_urls_apitest.cc @@ -15,11 +15,9 @@ const std::string kAllUrlsTarget = typedef ExtensionApiTest AllUrlsApiTest; -#if !defined(OS_WIN) -#define WhitelistedExtension FLAKY_WhitelistedExtension -#endif - IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) { + Extension::emit_traces_for_whitelist_extension_test_ = true; + // First load the two extension. FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") .AppendASCII("content_script"); @@ -28,8 +26,11 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) { ExtensionsService* service = browser()->profile()->GetExtensionsService(); const size_t size_before = service->extensions()->size(); + std::cout << "***** LoadExtension1 called \n" << std::flush; ASSERT_TRUE(LoadExtension(extension_dir1)); + std::cout << "***** LoadExtension2 called \n" << std::flush; ASSERT_TRUE(LoadExtension(extension_dir2)); + std::cout << "***** LoadExtensions done \n" << std::flush; EXPECT_EQ(size_before + 2, service->extensions()->size()); Extension* extensionA = service->extensions()->at(size_before); Extension* extensionB = service->extensions()->at(size_before + 1); @@ -43,52 +44,72 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) { // Ideally, we'd set the whitelist first and then load the extensions. // However, we can't reliably know the ids of the extensions until we load // them so we reload them so that the whitelist is in effect from the start. + std::cout << "***** ReloadExtension1 called \n" << std::flush; ReloadExtension(extensionA->id()); + std::cout << "***** ReloadExtension2 called \n" << std::flush; ReloadExtension(extensionB->id()); + std::cout << "***** ReloadExtensions done \n" << std::flush; std::string url; // Now verify we run content scripts on chrome://newtab/. url = "chrome://newtab/"; + std::cout << "***** " << url.c_str() << "\n" << std::flush; ExtensionTestMessageListener listener1a("content script: " + url, false); ExtensionTestMessageListener listener1b("execute: " + url, false); ui_test_utils::NavigateToURL(browser(), GURL(url)); + std::cout << "***** Wait 1a\n" << std::flush; ASSERT_TRUE(listener1a.WaitUntilSatisfied()); + std::cout << "***** Wait 1b\n" << std::flush; ASSERT_TRUE(listener1b.WaitUntilSatisfied()); // Now verify data: urls. url = "data:text/html;charset=utf-8,<html>asdf</html>"; + std::cout << "***** " << url.c_str() << "\n" << std::flush; ExtensionTestMessageListener listener2a("content script: " + url, false); ExtensionTestMessageListener listener2b("execute: " + url, false); ui_test_utils::NavigateToURL(browser(), GURL(url)); + std::cout << "***** Wait 2a\n" << std::flush; ASSERT_TRUE(listener2a.WaitUntilSatisfied()); + std::cout << "***** Wait 2b\n" << std::flush; ASSERT_TRUE(listener2b.WaitUntilSatisfied()); // Now verify about:version. url = "about:version"; + std::cout << "***** " << url.c_str() << "\n" << std::flush; ExtensionTestMessageListener listener3a("content script: " + url, false); ExtensionTestMessageListener listener3b("execute: " + url, false); ui_test_utils::NavigateToURL(browser(), GURL(url)); + std::cout << "***** Wait 3a\n" << std::flush; ASSERT_TRUE(listener3a.WaitUntilSatisfied()); + std::cout << "***** Wait 3b\n" << std::flush; ASSERT_TRUE(listener3b.WaitUntilSatisfied()); // Now verify about:blank. url = "about:blank"; + std::cout << "***** " << url.c_str() << "\n" << std::flush; ExtensionTestMessageListener listener4a("content script: " + url, false); ExtensionTestMessageListener listener4b("execute: " + url, false); ui_test_utils::NavigateToURL(browser(), GURL(url)); + std::cout << "***** Wait 4a\n" << std::flush; ASSERT_TRUE(listener4a.WaitUntilSatisfied()); + std::cout << "***** Wait 4b\n" << std::flush; ASSERT_TRUE(listener4b.WaitUntilSatisfied()); // Now verify we can script a regular http page. ASSERT_TRUE(test_server()->Start()); GURL page_url = test_server()->GetURL(kAllUrlsTarget); + std::cout << "***** " << page_url.spec().c_str() << "\n" << std::flush; ExtensionTestMessageListener listener5a("content script: " + page_url.spec(), false); ExtensionTestMessageListener listener5b("execute: " + page_url.spec(), false); ui_test_utils::NavigateToURL(browser(), page_url); + std::cout << "***** Wait 5a\n" << std::flush; ASSERT_TRUE(listener5a.WaitUntilSatisfied()); + std::cout << "***** Wait 5b\n" << std::flush; ASSERT_TRUE(listener5b.WaitUntilSatisfied()); + + std::cout << "***** DONE!\n" << std::flush; } // Test that an extension NOT whitelisted for scripting can ask for <all_urls> diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 4a5dbcc..2f7e2e7 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -40,6 +40,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/image_decoder.h" +// TODO(finur): Remove once I have one failed run of the Whitelist extension test. +#include <iostream> + namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; namespace errors = extension_manifest_errors; @@ -169,6 +172,9 @@ static const char kWindowPermission[] = "windows"; } // namespace +// static +bool Extension::emit_traces_for_whitelist_extension_test_ = false; + const FilePath::CharType Extension::kManifestFilename[] = FILE_PATH_LITERAL("manifest.json"); const FilePath::CharType Extension::kLocaleFolder[] = @@ -2148,12 +2154,22 @@ bool Extension::CanExecuteScriptEverywhere() const { ScriptingWhitelist* whitelist = ExtensionConfig::GetSingleton()->whitelist(); + if (emit_traces_for_whitelist_extension_test_) + std::cout << "***** CanExecuteScriptEverywhere() called \n" << std::flush; + for (ScriptingWhitelist::const_iterator it = whitelist->begin(); it != whitelist->end(); ++it) { - if (id() == *it) + if (emit_traces_for_whitelist_extension_test_) + std::cout << "***** " << id() << " == " << *it << "\n" << std::flush; + if (id() == *it) { + if (emit_traces_for_whitelist_extension_test_) + std::cout << "***** CAN execute\n" << std::flush; return true; + } } + if (emit_traces_for_whitelist_extension_test_) + std::cout << "***** Can NOT execute \n" << std::flush; return false; } diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 0302771..d93772f 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -90,6 +90,9 @@ class Extension { TYPE_PACKAGED_APP }; + // TODO(finur): Remove once I have one failed run of this test. + static bool emit_traces_for_whitelist_extension_test_; + // Contains a subset of the extension's data that doesn't change once // initialized, and therefore shareable across threads without locking. struct StaticData : public base::RefCountedThreadSafe<StaticData> { |