chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc - Issue 8956050: Rename TabContents::controller() to GetController and put it into the WebContents interface.

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: chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc

Issue 8956050: Rename TabContents::controller() to GetController and put it into the WebContents interface. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years 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 | « chrome/browser/geolocation/chrome_geolocation_permission_context.cc ('k') | chrome/browser/geolocation/geolocation_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc

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

--- chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc (revision 115228)

+++ chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc (working copy)

@@ -209,8 +209,8 @@

void GeolocationPermissionContextTests::AddNewTab(const GURL& url) {

TabContents* new_tab =

new TabContents(profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);

- new_tab->controller().LoadURL(url, content::Referrer(),

- content::PAGE_TRANSITION_TYPED, std::string());

+ new_tab->GetController().LoadURL(

+ url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

static_cast<TestRenderViewHost*>(new_tab->render_manager_for_testing()->

current_host())->SendNavigate(extra_tabs_.size() + 1, url);

extra_tabs_.push_back(new TabContentsWrapper(new_tab));

@@ -579,7 +579,7 @@

EXPECT_EQ(0U, infobar_tab_helper()->infobar_count());

// Go back: navigate to a pending entry before requesting geolocation

// permission.

- contents()->controller().GoBack();

+ contents()->GetController().GoBack();

// Request permission for the committed frame (not the pending one).

RequestGeolocationPermission(

process_id(), render_id(), bridge_id(), requesting_frame_1);

@@ -589,11 +589,11 @@

ASSERT_TRUE(infobar_0);

// Ensure the infobar is not yet expired.

content::LoadCommittedDetails details;

- details.entry = contents()->controller().GetLastCommittedEntry();

+ details.entry = contents()->GetController().GetLastCommittedEntry();

ASSERT_FALSE(infobar_0->ShouldExpire(details));

// Commit the "GoBack()" above, and ensure the infobar is now expired.

contents()->CommitPendingNavigation();

- details.entry = contents()->controller().GetLastCommittedEntry();

+ details.entry = contents()->GetController().GetLastCommittedEntry();

ASSERT_TRUE(infobar_0->ShouldExpire(details));

// Delete the tab contents.