From 1d57ff28e37fe1e20cd2366317ed53abbf733c10 Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Mon, 4 Oct 2010 14:47:27 +0000 Subject: Remove the traces, as I believe I have found the cause for the failure. TBR=aa BUG=None TEST=None Review URL: http://codereview.chromium.org/3534008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61367 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/all_urls_apitest.cc | 7 +------ chrome/browser/extensions/extension_test_message_listener.cc | 5 ----- chrome/browser/renderer_host/browser_render_process_host.cc | 7 ------- chrome/common/extensions/extension.cc | 7 ------- .../extensions/api_test/all_urls/content_script/background.html | 4 ---- .../extensions/api_test/all_urls/execute_script/background.html | 3 --- 6 files changed, 1 insertion(+), 32 deletions(-) diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc index 7d6c41e..03c16b4 100644 --- a/chrome/browser/extensions/all_urls_apitest.cc +++ b/chrome/browser/extensions/all_urls_apitest.cc @@ -15,12 +15,7 @@ const std::string kAllUrlsTarget = typedef ExtensionApiTest AllUrlsApiTest; -// TODOf Remove. -void Dbg(const char* msg) { - std::cout << "**** " << msg << "\n" << std::flush; -} - -IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) { +IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, FAILS_WhitelistedExtension) { // First add the two extensions we are going to load to the whitelist. const char* kCanExecuteScriptsEverywhere[] = { "fekpfaahmgnelcjpkefdnpiofglcgmgo", diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc index 73e2d8a..bfa9db7 100644 --- a/chrome/browser/extensions/extension_test_message_listener.cc +++ b/chrome/browser/extensions/extension_test_message_listener.cc @@ -8,9 +8,6 @@ #include "chrome/common/notification_type.h" #include "chrome/test/ui_test_utils.h" -// TODOf remove. -#include - ExtensionTestMessageListener::ExtensionTestMessageListener( const std::string& expected_message) : expected_message_(expected_message), satisfied_(false), @@ -34,8 +31,6 @@ void ExtensionTestMessageListener::Observe( const NotificationSource& source, const NotificationDetails& details) { const std::string& content = *Details(details).ptr(); - // TODOf remove. - std::cout << "**** Observed: '" << content.c_str() << "', expected: '" << expected_message_.c_str() << "'\n" << std::flush; if (!satisfied_ && content == expected_message_) { satisfied_ = true; registrar_.RemoveAll(); // Stop listening for more messages. diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 0cd43ff..adc1dc3 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" -// TODOf remove. -#include - // 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 { @@ -713,10 +710,6 @@ void BrowserRenderProcessHost::SendExtensionInfo() { if (info.icon_url.is_empty()) info.icon_url = GURL("chrome://theme/IDR_APP_DEFAULT_ICON"); params.extensions.push_back(info); - - // TODOf remove. - std::cout << "**** SendExtensionInfo: '" << info.name.c_str() << "'\n" << std::flush; - std::cout << "**** SendExtensionInfo: '" << info.allowed_to_execute_script_everywhere << "'\n" << std::flush; } Send(new ViewMsg_ExtensionsUpdated(params)); diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index e1a5bb2..bddd6ec 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -40,9 +40,6 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/image_decoder.h" -// TODOf remove. -#include - namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; namespace errors = extension_manifest_errors; @@ -2141,14 +2138,10 @@ bool Extension::IsAPIPermission(const std::string& str) { } bool Extension::CanExecuteScriptEverywhere() const { - // TODOf remove. - std::cout << "**** Extension::CanExecuteScriptEverywhere()\n"; if (location() == Extension::COMPONENT) return true; for (size_t i = 0; i < kNumCanExecuteScriptsEverywhere; ++i) { - // TODOf remove. - std::cout << "**** Comparing: " << id().c_str() << "==" << scripting_whitelist_[i] << L"\n" << std::flush; if (id() == scripting_whitelist_[i]) return true; } diff --git a/chrome/test/data/extensions/api_test/all_urls/content_script/background.html b/chrome/test/data/extensions/api_test/all_urls/content_script/background.html index f03b5a5..91c527d 100644 --- a/chrome/test/data/extensions/api_test/all_urls/content_script/background.html +++ b/chrome/test/data/extensions/api_test/all_urls/content_script/background.html @@ -6,12 +6,8 @@