Adjust the traces for WhitelistedExtension.

Looks like the tabUpdated event is not being received by the extension.

TBR=aa
BUG=57694
TEST=Tracking down flakiness in a test.

Review URL: http://codereview.chromium.org/3702007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62278 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 22 insertions, 22 deletions

diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index ef10800..f139c3b 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -388,7 +388,14 @@ void ExtensionBrowserEventRouter::TabUpdated(TabContents* contents,
     std::string json_args;
     base::JSONWriter::Write(&args, false, &json_args);
 
+    // TODO(finnur): Remove once I have one failed run of this test.
+    if (Extension::emit_traces_for_whitelist_extension_test_)
+      printf("***** not SENDING TabUpdated\n");
+
     DispatchEvent(contents->profile(), events::kOnTabUpdated, json_args);
+  } else {
+    if (Extension::emit_traces_for_whitelist_extension_test_)
+      printf("***** NOT SENDING TabUpdated\n");
   }
 }
 
@@ -398,6 +405,8 @@ void ExtensionBrowserEventRouter::Observe(NotificationType type,
   if (type == NotificationType::NAV_ENTRY_COMMITTED) {
     NavigationController* source_controller =
         Source<NavigationController>(source).ptr();
+    if (Extension::emit_traces_for_whitelist_extension_test_)
+      printf("***** Observe, preparing TabUpdated\n");
     TabUpdated(source_controller->tab_contents(), true);
   } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
     // Tab was destroyed after being detached (without being re-attached).
@@ -421,6 +430,8 @@ void ExtensionBrowserEventRouter::Observe(NotificationType type,
 void ExtensionBrowserEventRouter::TabChangedAt(TabContents* contents,
                                                int index,
                                                TabChangeType change_type) {
+  if (Extension::emit_traces_for_whitelist_extension_test_)
+    printf("***** TabChangedAt, preparing TabUpdated\n");
   TabUpdated(contents, false);
 }
 
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 521b934..718120f 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -705,13 +705,6 @@ void BrowserRenderProcessHost::SendExtensionInfo() {
         extension->CanExecuteScriptEverywhere();
     info.host_permissions = extension->host_permissions();
 
-    // TODO(finnur): Remove after capturing debug info.
-    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,
                                           ExtensionIconSet::MATCH_EXACTLY);
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index 084f13e..40e1a8e 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -1110,10 +1110,18 @@ void NavigationController::NotifyNavigationEntryCommitted(
   tab_contents_->NotifyNavigationStateChanged(
       kInvalidateAllButShelves | extra_invalidate_flags);
 
+  // TODO(finnur): Remove once I have results from failed run of this test.
+  if (Extension::emit_traces_for_whitelist_extension_test_)
+    printf("***** Sending NAV_ENTRY_COMMITTED\n");
+
   NotificationService::current()->Notify(
       NotificationType::NAV_ENTRY_COMMITTED,
       Source<NavigationController>(this),
       notification_details);
+
+  // TODO(finnur): Remove once I have results from failed run of this test.
+  if (Extension::emit_traces_for_whitelist_extension_test_)
+    printf("***** NAV_ENTRY_COMMITTED sent\n");
 }
 
 // static
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 973346c..aa7a16d 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -40,10 +40,6 @@
 #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;
@@ -2155,29 +2151,21 @@ bool Extension::IsAPIPermission(const std::string& str) {
 }
 
 bool Extension::CanExecuteScriptEverywhere() const {
-  if (location() == Extension::COMPONENT) {
-    if (emit_traces_for_whitelist_extension_test_)
-      printf("***** CAN execute (is component)\n");
+  if (location() == Extension::COMPONENT)
     return true;
-  }
 
   ScriptingWhitelist* whitelist =
       ExtensionConfig::GetSingleton()->whitelist();
 
-  if (emit_traces_for_whitelist_extension_test_)
-    printf("***** CanExecuteScriptEverywhere() called \n");
-
   for (ScriptingWhitelist::const_iterator it = whitelist->begin();
        it != whitelist->end(); ++it) {
     if (id() == *it) {
-      if (emit_traces_for_whitelist_extension_test_)
-        printf("***** CAN execute\n");
       return true;
     }
   }
 
   if (emit_traces_for_whitelist_extension_test_)
-    printf("***** Can NOT execute \n");
+    printf("***** CanExecuteScriptEverywhere returns FALSE \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 66689c6..ad8bb8c 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
@@ -10,7 +10,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"})

+  chrome.tabs.executeScript(tabId, {file: "execute_script.js"});

 });

 

 chrome.extension.onRequest.addListener(