3 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index be6d3b7..6918a05 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -5,6 +5,6 @@
 #include "chrome/browser/extensions/extension_apitest.h"
 
 // Flaky, http://crbug.com/20828. Please consult phajdan.jr before re-enabling.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Tabs) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
   ASSERT_TRUE(RunExtensionTest("tabs")) << message_;
 }
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 3b57ea9..e79c161 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -567,6 +567,7 @@ bool UpdateTabFunction::RunImpl() {
     }
 
     controller.LoadURL(new_gurl, GURL(), PageTransition::LINK);
+    DCHECK_EQ(new_gurl.spec(), contents->GetURL().spec());
   }
 
   bool selected = false;
@@ -578,6 +579,7 @@ bool UpdateTabFunction::RunImpl() {
         &selected));
     if (selected && tab_strip->selected_index() != tab_index) {
       tab_strip->SelectTabContentsAt(tab_index, false);
+      DCHECK_EQ(contents, tab_strip->GetSelectedTabContents());
     }
   }
 
diff --git a/chrome/test/data/extensions/api_test/tabs/test.js b/chrome/test/data/extensions/api_test/tabs/test.js
index 280d1d8..6759b7a 100644
--- a/chrome/test/data/extensions/api_test/tabs/test.js
+++ b/chrome/test/data/extensions/api_test/tabs/test.js
@@ -94,6 +94,7 @@ chrome.test.runTests([
     chrome.tabs.update(testTabId, {"selected":true, "url": "chrome://c"},
                        testCallback(false, function(){
       chrome.tabs.getSelected(firstWindowId, testCallback(true, function(tab) {
+        assertEq(testTabId, tab.id);
         assertEq("chrome://c/", tab.url);
         assertEq(true, tab.selected);
       }));