commit 47ae23376463a83ec03dd83fddd8aa20ee081d09
author avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jan 29 01:50:48 2013
committer avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jan 29 01:50:48 2013
tree 73816ce8c8f8bb6b531e39e48ca41810adf97534
parent 40739ea059ffa2e20c9428040f5a7ccc96d95034

Remove TabStripModel wrapper use.

BUG=167548
TEST=no functional change


Review URL: https://chromiumcodereview.appspot.com/12066003

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

chrome/browser/extensions/chrome_app_api_browsertest.cc

diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc
index 1b4b008..9e27d3b 100644
--- a/chrome/browser/extensions/chrome_app_api_browsertest.cc
+++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/manifest.h"
@@ -34,7 +34,7 @@
     bool result;
     CHECK(
         content::ExecuteScriptInFrameAndExtractBool(
-            chrome::GetActiveWebContents(browser()),
+            browser()->tab_strip_model()->GetActiveWebContents(),
             frame_xpath,
             kGetAppIsInstalled,
             &result));
@@ -49,7 +49,7 @@
     std::string result;
     CHECK(
         content::ExecuteScriptInFrameAndExtractString(
-            chrome::GetActiveWebContents(browser()),
+            browser()->tab_strip_model()->GetActiveWebContents(),
             frame_xpath,
             kGetAppInstallState,
             &result));
@@ -64,7 +64,7 @@
     std::string result;
     CHECK(
         content::ExecuteScriptInFrameAndExtractString(
-            chrome::GetActiveWebContents(browser()),
+            browser()->tab_strip_model()->GetActiveWebContents(),
             frame_xpath,
             kGetAppRunningState,
             &result));
@@ -120,7 +120,7 @@
   std::string result;
   ASSERT_TRUE(
       content::ExecuteScriptAndExtractString(
-          chrome::GetActiveWebContents(browser()),
+          browser()->tab_strip_model()->GetActiveWebContents(),
           kGetAppDetails,
           &result));
   EXPECT_EQ("null", result);
@@ -134,7 +134,7 @@
   ui_test_utils::NavigateToURL(browser(), app_url);
   ASSERT_TRUE(
       content::ExecuteScriptAndExtractString(
-          chrome::GetActiveWebContents(browser()),
+          browser()->tab_strip_model()->GetActiveWebContents(),
           kGetAppDetails,
           &result));
   scoped_ptr<DictionaryValue> app_details(
@@ -148,7 +148,7 @@
   // that isInstalled should have the initial value.
   ASSERT_TRUE(
       content::ExecuteScriptAndExtractString(
-          chrome::GetActiveWebContents(browser()),
+          browser()->tab_strip_model()->GetActiveWebContents(),
           "window.domAutomationController.send("
           "    function() {"
           "        var value = window.chrome.app.isInstalled;"
@@ -198,7 +198,7 @@
   bool result = false;
   ASSERT_TRUE(
       content::ExecuteScriptAndExtractBool(
-          chrome::GetActiveWebContents(browser()),
+          browser()->tab_strip_model()->GetActiveWebContents(),
           kTestUnsuccessfulAccess,
           &result));
   EXPECT_TRUE(result);
@@ -212,7 +212,7 @@
   std::string json;
   ASSERT_TRUE(
       content::ExecuteScriptAndExtractString(
-          chrome::GetActiveWebContents(browser()),
+          browser()->tab_strip_model()->GetActiveWebContents(),
           kGetDetailsForFrame,
           &json));