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

Unified Diff: chrome/browser/loadtimes_extension_bindings_browsertest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
===================================================================
--- chrome/browser/loadtimes_extension_bindings_browsertest.cc (revision 145001)
+++ chrome/browser/loadtimes_extension_bindings_browsertest.cc (working copy)
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.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"
@@ -19,7 +20,7 @@
// before we read them. We ought to test that too. Until the race is fixed,
// zero it out so the test is stable.
content::RenderViewHost* rvh =
- browser()->GetActiveWebContents()->GetRenderViewHost();
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost();
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
rvh, L"",
L"window.before.firstPaintAfterLoadTime = 0;"
@@ -45,7 +46,7 @@
GURL plain_url = test_server()->GetURL("blank");
ui_test_utils::NavigateToURL(browser(), plain_url);
content::RenderViewHost* rvh =
- browser()->GetActiveWebContents()->GetRenderViewHost();
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost();
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
rvh, L"", L"window.before = window.chrome.loadTimes()"));
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
@@ -62,7 +63,7 @@
GURL hash_url(plain_url.spec() + "#");
ui_test_utils::NavigateToURL(browser(), plain_url);
content::RenderViewHost* rvh =
- browser()->GetActiveWebContents()->GetRenderViewHost();
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost();
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
rvh, L"", L"window.before = window.chrome.loadTimes()"));
ui_test_utils::NavigateToURL(browser(), hash_url);
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/net/load_timing_observer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698