fix chrome.tabs.onUpdated bugs, add browsertest

chrome/browser/extensions/extension_tabs_module.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_tabs_module.h"
 
 #include "base/histogram.h"
 #include "base/base64.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
@@ skipping 60 matching lines @@
 static std::string GetWindowTypeText(Browser::Type type);
 
 int ExtensionTabUtil::GetWindowId(const Browser* browser) {
   return browser->session_id().id();
 }
 
 int ExtensionTabUtil::GetTabId(const TabContents* tab_contents) {
   return tab_contents->controller().session_id().id();
 }
 
-ExtensionTabUtil::TabStatus ExtensionTabUtil::GetTabStatus(
-    const TabContents* tab_contents) {
-  return tab_contents->is_loading() ? TAB_LOADING : TAB_COMPLETE;
-}
-
-std::string ExtensionTabUtil::GetTabStatusText(TabStatus status) {
-  std::string text;
-  switch (status) {
-    case TAB_LOADING:
-      text = keys::kStatusValueLoading;
-      break;
-    case TAB_COMPLETE:
-      text = keys::kStatusValueComplete;
-      break;
-  }
-
-  return text;
+std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) {
+  return is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete;
 }
 
 int ExtensionTabUtil::GetWindowIdOfTab(const TabContents* tab_contents) {
   return tab_contents->controller().window_id().id();
 }
 
 DictionaryValue* ExtensionTabUtil::CreateTabValue(
     const TabContents* contents) {
   // Find the tab strip and index of this guy.
   for (BrowserList::const_iterator it = BrowserList::begin();
@@ skipping 15 matching lines @@
   for (int i = 0; i < tab_strip->count(); ++i) {
     tab_list->Append(ExtensionTabUtil::CreateTabValue(
         tab_strip->GetTabContentsAt(i), tab_strip, i));
   }
 
   return tab_list;
 }
 
 DictionaryValue* ExtensionTabUtil::CreateTabValue(
     const TabContents* contents, TabStripModel* tab_strip, int tab_index) {
-  TabStatus status = GetTabStatus(contents);
-
   DictionaryValue* result = new DictionaryValue();
   result->SetInteger(keys::kIdKey, ExtensionTabUtil::GetTabId(contents));
   result->SetInteger(keys::kIndexKey, tab_index);
   result->SetInteger(keys::kWindowIdKey,
                      ExtensionTabUtil::GetWindowIdOfTab(contents));
   result->SetString(keys::kUrlKey, contents->GetURL().spec());
-  result->SetString(keys::kStatusKey, GetTabStatusText(status));
+  result->SetString(keys::kStatusKey, GetTabStatusText(contents->is_loading()));
   result->SetBoolean(keys::kSelectedKey,
                      tab_strip && tab_index == tab_strip->selected_index());
   result->SetString(keys::kTitleKey, UTF16ToWide(contents->GetTitle()));
   result->SetBoolean(keys::kIncognitoKey,
                      contents->profile()->IsOffTheRecord());
 
-  if (status != TAB_LOADING) {
+  if (!contents->is_loading()) {
     NavigationEntry* entry = contents->controller().GetActiveEntry();
     if (entry) {
       if (entry->favicon().is_valid())
         result->SetString(keys::kFavIconUrlKey, entry->favicon().url().spec());
     }
   }
 
   return result;
 }
 
@@ skipping 976 matching lines @@
     // caller.
     use_type = url.is_valid() && (url != resolved_url) ?
         RELATIVE_URL_RESOLUTIONS_DIFFER : RELATIVE_URL_RESOLUTIONS_AGREE;
   }
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.APIUse_RelativeURL", use_type,
       EXTENSION_API_RELATIVE_URL_USE_MAX_VALUE);
 
   return url;
 }