content/browser/renderer_host/render_view_host_browsertest.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_view_host_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

« no previous file with comments | « content/browser/renderer_host/render_process_host_browsertest.cc ('k') | content/browser/renderer_host/render_view_host_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_browsertest.cc

===================================================================

--- content/browser/renderer_host/render_view_host_browsertest.cc (revision 145001)

+++ content/browser/renderer_host/render_view_host_browsertest.cc (working copy)

@@ -6,6 +6,7 @@

#include "base/utf_string_conversions.h"

#include "base/values.h"

#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/browser/renderer_host/render_view_host_impl.h"

@@ -33,7 +34,7 @@

ui_test_utils::NavigateToURL(browser(), empty_url);

RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(

- browser()->GetActiveWebContents()->GetRenderViewHost());

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost());

{

scoped_ptr<Value> value(

@@ -206,7 +207,7 @@

IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {

ASSERT_TRUE(test_server()->Start());

RenderViewHostTestWebContentsObserver observer(

- browser()->GetActiveWebContents());

+ chrome::GetActiveWebContents(browser()));

GURL test_url = test_server()->GetURL("files/simple.html");

ui_test_utils::NavigateToURL(browser(), test_url);

@@ -219,7 +220,7 @@

IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {

ASSERT_TRUE(test_server()->Start());

RenderViewHostTestWebContentsObserver observer(

- browser()->GetActiveWebContents());

+ chrome::GetActiveWebContents(browser()));

// Base URL is not set if it is the same as the URL.

GURL test_url = test_server()->GetURL("files/simple.html");