summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/extensions/all_urls_apitest.cc51
-rw-r--r--chrome/browser/extensions/execute_code_in_tab_function.cc6
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc10
-rw-r--r--chrome/common/extensions/extension.cc34
-rw-r--r--chrome/test/data/extensions/api_test/all_urls/execute_script/background.html1
5 files changed, 60 insertions, 42 deletions
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
index 87f2101..2a26d15 100644
--- a/chrome/browser/extensions/all_urls_apitest.cc
+++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -15,8 +15,11 @@ const std::string kAllUrlsTarget =
typedef ExtensionApiTest AllUrlsApiTest;
-// Sometimes hangs: http://crbug.com/57694
-IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, FLAKY_WhitelistedExtension) {
+// Note: This test is flaky, but is actively being worked on.
+// Finnur is adding traces to figure out where the problem lies and
+// needs to check in these traces because the problem doesn't repro
+// locally (or on the try bots).
+IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) {
Extension::emit_traces_for_whitelist_extension_test_ = true;
// First load the two extension.
@@ -27,11 +30,11 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, FLAKY_WhitelistedExtension) {
ExtensionsService* service = browser()->profile()->GetExtensionsService();
const size_t size_before = service->extensions()->size();
- std::cout << "***** LoadExtension1 called \n" << std::flush;
+ printf("***** LoadExtension1 called \n");
ASSERT_TRUE(LoadExtension(extension_dir1));
- std::cout << "***** LoadExtension2 called \n" << std::flush;
+ printf("***** LoadExtension2 called \n");
ASSERT_TRUE(LoadExtension(extension_dir2));
- std::cout << "***** LoadExtensions done \n" << std::flush;
+ printf("***** LoadExtensions done \n");
EXPECT_EQ(size_before + 2, service->extensions()->size());
Extension* extensionA = service->extensions()->at(size_before);
Extension* extensionB = service->extensions()->at(size_before + 1);
@@ -45,72 +48,72 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, FLAKY_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;
+ printf("***** ReloadExtension1 called \n");
ReloadExtension(extensionA->id());
- std::cout << "***** ReloadExtension2 called \n" << std::flush;
+ printf("***** ReloadExtension2 called \n");
ReloadExtension(extensionB->id());
- std::cout << "***** ReloadExtensions done \n" << std::flush;
+ printf("***** ReloadExtensions done \n");
std::string url;
// Now verify we run content scripts on chrome://newtab/.
url = "chrome://newtab/";
- std::cout << "***** " << url.c_str() << "\n" << std::flush;
+ printf("***** %s\n", url.c_str());
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;
+ printf("***** Wait 1a\n");
ASSERT_TRUE(listener1a.WaitUntilSatisfied());
- std::cout << "***** Wait 1b\n" << std::flush;
+ printf("***** Wait 1b\n");
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;
+ printf("***** %s\n", url.c_str());
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;
+ printf("***** Wait 2a\n");
ASSERT_TRUE(listener2a.WaitUntilSatisfied());
- std::cout << "***** Wait 2b\n" << std::flush;
+ printf("***** Wait 2b\n");
ASSERT_TRUE(listener2b.WaitUntilSatisfied());
// Now verify about:version.
url = "about:version";
- std::cout << "***** " << url.c_str() << "\n" << std::flush;
+ printf("***** %s\n", url.c_str());
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;
+ printf("***** Wait 3a\n");
ASSERT_TRUE(listener3a.WaitUntilSatisfied());
- std::cout << "***** Wait 3b\n" << std::flush;
+ printf("***** Wait 3b\n");
ASSERT_TRUE(listener3b.WaitUntilSatisfied());
// Now verify about:blank.
url = "about:blank";
- std::cout << "***** " << url.c_str() << "\n" << std::flush;
+ printf("***** %s\n", url.c_str());
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;
+ printf("***** Wait 4a\n");
ASSERT_TRUE(listener4a.WaitUntilSatisfied());
- std::cout << "***** Wait 4b\n" << std::flush;
+ printf("***** Wait 4b\n");
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;
+ printf("***** %s\n", page_url.spec().c_str());
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;
+ printf("***** Wait 5a\n");
ASSERT_TRUE(listener5a.WaitUntilSatisfied());
- std::cout << "***** Wait 5b\n" << std::flush;
+ printf("***** Wait 5b\n");
ASSERT_TRUE(listener5b.WaitUntilSatisfied());
- std::cout << "***** DONE!\n" << std::flush;
+ printf("***** DONE!\n");
}
// Test that an extension NOT whitelisted for scripting can ask for <all_urls>
diff --git a/chrome/browser/extensions/execute_code_in_tab_function.cc b/chrome/browser/extensions/execute_code_in_tab_function.cc
index b7bf999..40719eb 100644
--- a/chrome/browser/extensions/execute_code_in_tab_function.cc
+++ b/chrome/browser/extensions/execute_code_in_tab_function.cc
@@ -30,6 +30,8 @@ ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {
}
bool ExecuteCodeInTabFunction::RunImpl() {
+ if (Extension::emit_traces_for_whitelist_extension_test_)
+ printf("***** ExecuteCodeInTabFunction::RunImpl() runs\n");
DictionaryValue* script_info;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &script_info));
size_t number_of_value = script_info->size();
@@ -87,8 +89,12 @@ bool ExecuteCodeInTabFunction::RunImpl() {
&host_permissions,
NULL,
&error_)) {
+ if (Extension::emit_traces_for_whitelist_extension_test_)
+ printf("***** CANNOT EXECUTE!! \n");
return false;
}
+ if (Extension::emit_traces_for_whitelist_extension_test_)
+ printf("***** ALLOWED to execute. \n");
if (script_info->HasKey(keys::kAllFramesKey)) {
if (!script_info->GetBoolean(keys::kAllFramesKey, &all_frames_))
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 392b10f..521b934 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -77,9 +77,6 @@ using WebKit::WebCache;
#include "third_party/skia/include/core/SkBitmap.h"
-// TODO(finnur): Remove after capturing debug info.
-#include <iostream>
-
// This class creates the IO thread for the renderer when running in
// single-process mode. It's not used in multi-process mode.
class RendererMainThread : public base::Thread {
@@ -709,8 +706,11 @@ void BrowserRenderProcessHost::SendExtensionInfo() {
info.host_permissions = extension->host_permissions();
// TODO(finnur): Remove after capturing debug info.
- if (Extension::emit_traces_for_whitelist_extension_test_)
- std::cout << "*-*-* Sending down: " << info.allowed_to_execute_script_everywhere << " for CanExecuteEverywhere \n" << std::flush;
+ if (Extension::emit_traces_for_whitelist_extension_test_) {
+ printf("*-*-* Sending down: %d for %s\n",
+ info.allowed_to_execute_script_everywhere,
+ info.name.c_str());
+ }
// The icon in the page is 96px. We'd rather not scale up, so use 128.
info.icon_url = extension->GetIconURL(Extension::EXTENSION_ICON_LARGE,
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 2f7e2e7..973346c 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -40,7 +40,8 @@
#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.
+// TODO(finur): Remove once I have one failed run of the Whitelist extension
+// test.
#include <iostream>
namespace keys = extension_manifest_keys;
@@ -1912,12 +1913,12 @@ static std::string SizeToString(const gfx::Size& max_size) {
// static
void Extension::SetScriptingWhitelist(
const std::vector<std::string>& whitelist) {
- ScriptingWhitelist* current_whitelist =
- ExtensionConfig::GetSingleton()->whitelist();
- current_whitelist->clear();
- for (ScriptingWhitelist::const_iterator it = whitelist.begin();
- it != whitelist.end(); ++it) {
- current_whitelist->push_back(*it);
+ ScriptingWhitelist* current_whitelist =
+ ExtensionConfig::GetSingleton()->whitelist();
+ current_whitelist->clear();
+ for (ScriptingWhitelist::const_iterator it = whitelist.begin();
+ it != whitelist.end(); ++it) {
+ current_whitelist->push_back(*it);
}
}
@@ -2078,6 +2079,8 @@ bool Extension::CanExecuteScriptOnPage(
switches::kAllowScriptingGallery)) {
if (error)
*error = errors::kCannotScriptGallery;
+ if (Extension::emit_traces_for_whitelist_extension_test_)
+ printf("***** CANNOT SCRIPT GALLERY!! \n");
return false;
}
@@ -2086,10 +2089,14 @@ bool Extension::CanExecuteScriptOnPage(
if ((*host_permissions)[i].MatchesUrl(page_url))
return true;
}
+ if (Extension::emit_traces_for_whitelist_extension_test_)
+ printf("***** HAS NO HOST PERMISSIONS!! \n");
}
if (script) {
if (script->MatchesUrl(page_url))
return true;
+ if (Extension::emit_traces_for_whitelist_extension_test_)
+ printf("***** HAS NO SCRIPT PERMISSIONS!! \n");
}
if (error) {
@@ -2148,28 +2155,29 @@ bool Extension::IsAPIPermission(const std::string& str) {
}
bool Extension::CanExecuteScriptEverywhere() const {
- if (location() == Extension::COMPONENT)
+ if (location() == Extension::COMPONENT) {
+ if (emit_traces_for_whitelist_extension_test_)
+ printf("***** CAN execute (is component)\n");
return true;
+ }
ScriptingWhitelist* whitelist =
ExtensionConfig::GetSingleton()->whitelist();
if (emit_traces_for_whitelist_extension_test_)
- std::cout << "***** CanExecuteScriptEverywhere() called \n" << std::flush;
+ printf("***** CanExecuteScriptEverywhere() called \n");
for (ScriptingWhitelist::const_iterator it = whitelist->begin();
it != whitelist->end(); ++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;
+ printf("***** CAN execute\n");
return true;
}
}
if (emit_traces_for_whitelist_extension_test_)
- std::cout << "***** Can NOT execute \n" << std::flush;
+ printf("***** Can NOT execute \n");
return false;
}
diff --git a/chrome/test/data/extensions/api_test/all_urls/execute_script/background.html b/chrome/test/data/extensions/api_test/all_urls/execute_script/background.html
index b7c4032..66689c6 100644
--- a/chrome/test/data/extensions/api_test/all_urls/execute_script/background.html
+++ b/chrome/test/data/extensions/api_test/all_urls/execute_script/background.html
@@ -9,6 +9,7 @@
console.log('EXECUTE SCRIPT background page runs');
chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
+ console.log('EXECUTE SCRIPT receives onUpdated for: ' + tab.url);
chrome.tabs.executeScript(tabId, {file: "execute_script.js"})
});
generated by cgit v1.1 at 2025-03-03 13:01:09 +0000