Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1281)

Unified Diff: chrome/browser/loadtimes_extension_bindings_browsertest.cc

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/loadtimes_extension_bindings_browsertest.cc
diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
index 1603f706b4ec7a3bc8a72468072d021854acb56a..6eaa71ad2d4ce0bc3f60c9de9cd453fcbd6ee860 100644
--- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc
+++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
@@ -18,7 +18,8 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest {
// TODO(simonjam): There's a race on whether or not first paint is populated
// before we read them. We ought to test that too. Until the race is fixed,
// zero it out so the test is stable.
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(content::ExecuteScript(
contents,
"window.before.firstPaintAfterLoadTime = 0;"
@@ -47,7 +48,8 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
ASSERT_TRUE(test_server()->Start());
GURL plain_url = test_server()->GetURL("blank");
ui_test_utils::NavigateToURL(browser(), plain_url);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(content::ExecuteScript(
contents, "window.before = window.chrome.loadTimes()"));
ASSERT_TRUE(content::ExecuteScript(
@@ -63,7 +65,8 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
GURL plain_url = test_server()->GetURL("blank");
GURL hash_url(plain_url.spec() + "#");
ui_test_utils::NavigateToURL(browser(), plain_url);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(content::ExecuteScript(
contents, "window.before = window.chrome.loadTimes()"));
ui_test_utils::NavigateToURL(browser(), hash_url);
« no previous file with comments | « chrome/browser/instant/instant_browsertest.cc ('k') | chrome/browser/managed_mode/managed_mode_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698