fix chrome.tabs.onUpdated bugs, add browsertest

chrome/browser/extensions/extension_browser_event_router.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_page_actions_module_constants.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 
 namespace events = extension_event_names;
 namespace tab_keys = extension_tabs_module_constants;
 namespace page_action_keys = extension_page_actions_module_constants;
 
 ExtensionBrowserEventRouter::TabEntry::TabEntry()
-    : state_(ExtensionTabUtil::TAB_COMPLETE),
-      pending_navigate_(false),
+    : complete_waiting_on_load_(false),
       url_() {
 }
 
-ExtensionBrowserEventRouter::TabEntry::TabEntry(const TabContents* contents)
-    : state_(ExtensionTabUtil::TAB_COMPLETE),
-      pending_navigate_(false),
-      url_(contents->GetURL()) {
-  UpdateLoadState(contents);
-}
-
 DictionaryValue* ExtensionBrowserEventRouter::TabEntry::UpdateLoadState(
     const TabContents* contents) {
-  ExtensionTabUtil::TabStatus old_state = state_;
-  state_ = ExtensionTabUtil::GetTabStatus(contents);
-
-  if (old_state == state_)
-    return false;
-
-  if (state_ == ExtensionTabUtil::TAB_LOADING) {
-    // Do not send "loading" state changed now. Wait for navigate so the new
-    // url is available.
-    pending_navigate_ = true;
+  // The tab may go in & out of loading (for instance if iframes navigate).
+  // We only want to respond to the first change from loading to !loading after
+  // the NAV_ENTRY_COMMITTED was fired.
+  if (!complete_waiting_on_load_ || contents->is_loading())
     return NULL;
 
-  } else if (state_ == ExtensionTabUtil::TAB_COMPLETE) {
-    // Send "complete" state change.
-    DictionaryValue* changed_properties = new DictionaryValue();
-    changed_properties->SetString(tab_keys::kStatusKey,
-        tab_keys::kStatusValueComplete);
-    return changed_properties;
-
-  } else {
-    NOTREACHED();
-    return NULL;
-  }
+  // Send "complete" state change.
+  complete_waiting_on_load_ = false;
+  DictionaryValue* changed_properties = new DictionaryValue();
+  changed_properties->SetString(tab_keys::kStatusKey,
+      tab_keys::kStatusValueComplete);
+  return changed_properties;
 }
 
 DictionaryValue* ExtensionBrowserEventRouter::TabEntry::DidNavigate(
     const TabContents* contents) {
-  if (!pending_navigate_)
-    return NULL;
-
+  // Send "loading" state change.
+  complete_waiting_on_load_ = true;
   DictionaryValue* changed_properties = new DictionaryValue();
   changed_properties->SetString(tab_keys::kStatusKey,
       tab_keys::kStatusValueLoading);
 
-  GURL new_url = contents->GetURL();
-  if (new_url != url_) {
-    url_ = new_url;
+  if (contents->GetURL() != url_) {
+    url_ = contents->GetURL();
     changed_properties->SetString(tab_keys::kUrlKey, url_.spec());
   }
 
-  pending_navigate_ = false;
   return changed_properties;
 }
 
 ExtensionBrowserEventRouter* ExtensionBrowserEventRouter::GetInstance() {
   return Singleton<ExtensionBrowserEventRouter>::get();
 }
 
 static void DispatchEvent(Profile* profile,
                           const char* event_name,
                           const std::string json_args) {
@@ skipping 36 matching lines @@
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end(); ++iter) {
     RegisterForBrowserNotifications(*iter);
 
     // Also catch up our internal bookkeeping of tab entries.
     Browser* browser = *iter;
     if (browser->tabstrip_model()) {
       for (int i = 0; i < browser->tabstrip_model()->count(); ++i) {
         TabContents* contents = browser->tabstrip_model()->GetTabContentsAt(i);
         int tab_id = ExtensionTabUtil::GetTabId(contents);
-        tab_entries_[tab_id] = TabEntry(contents);
+        tab_entries_[tab_id] = TabEntry();
       }
     }
   }
 
   initialized_ = true;
 }
 
 ExtensionBrowserEventRouter::ExtensionBrowserEventRouter()
     : initialized_(false) { }
 
@@ skipping 71 matching lines @@
 
   RegisterForTabNotifications(contents);
 }
 
 void ExtensionBrowserEventRouter::TabInsertedAt(TabContents* contents,
                                                 int index,
                                                 bool foreground) {
   // If tab is new, send created event.
   int tab_id = ExtensionTabUtil::GetTabId(contents);
   if (tab_entries_.find(tab_id) == tab_entries_.end()) {
-    tab_entries_[tab_id] = TabEntry(contents);
+    tab_entries_[tab_id] = TabEntry();
 
     TabCreatedAt(contents, index, foreground);
     return;
   }
 
   ListValue args;
   args.Append(Value::CreateIntegerValue(tab_id));
 
   DictionaryValue* object_args = new DictionaryValue();
   object_args->Set(tab_keys::kNewWindowIdKey, Value::CreateIntegerValue(
@@ skipping 208 matching lines @@
 
 void ExtensionBrowserEventRouter::BrowserActionExecuted(
     Profile* profile, const std::string& extension_id, Browser* browser) {
   TabContents* tab_contents = NULL;
   int tab_id = 0;
   if (!ExtensionTabUtil::GetDefaultTab(browser, &tab_contents, &tab_id))
     return;
   std::string event_name = std::string("browserAction/") + extension_id;
   DispatchEventWithTab(profile, event_name.c_str(), tab_contents);
 }