Take 2 at implementing activeTab.

chrome/browser/extensions/extension_tab_util.cc

Index: chrome/browser/extensions/extension_tab_util.cc
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 2e2db28480ce9b66d04e1a1bfe8437699cd0c1d3..ab2ae8596de020cf21f6083ae01bd8a342308249 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/extension_tab_util.h"
 
+#include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
@@ -41,22 +42,20 @@ int ExtensionTabUtil::GetWindowIdOfTabStripModel(
   return -1;
 }
 
-// TODO(sky): this function should really take a TabContentsWrapper.
 int ExtensionTabUtil::GetTabId(const WebContents* web_contents) {
   const TabContentsWrapper* tab =
       TabContentsWrapper::GetCurrentWrapperForContents(web_contents);
-  return tab ? tab->restore_tab_helper()->session_id().id() : -1;
+  return tab ? tab->extension_tab_helper()->GetTabId() : -1;
 }
 
 std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) {
   return is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete;
 }
 
-// TODO(sky): this function should really take a TabContentsWrapper.
 int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) {
   const TabContentsWrapper* tab =
       TabContentsWrapper::GetCurrentWrapperForContents(web_contents);
-  return tab ? tab->restore_tab_helper()->window_id().id() : -1;
+  return tab ? tab->extension_tab_helper()->GetWindowId() : -1;
 }
 
 DictionaryValue* ExtensionTabUtil::CreateTabValue(const WebContents* contents) {