chrome/browser/geolocation/geolocation_browsertest.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

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/geolocation_browsertest.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/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_unittest.cc ('k') | chrome/browser/infobars/infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_browsertest.cc

diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc

index 3a41d99ab33d2161b57dfdc694b6a77705d26824..712ce9b06f1bc58b0c64b2868ff7074c27aa8557 100644

--- a/chrome/browser/geolocation/geolocation_browsertest.cc

+++ b/chrome/browser/geolocation/geolocation_browsertest.cc

@@ -46,7 +46,7 @@ class IFrameLoader : public content::NotificationObserver {

: navigation_completed_(false),

javascript_completed_(false) {

NavigationController* controller =

- &browser->GetSelectedTabContents()->GetController();

+ &browser->GetSelectedTabContents()->controller();

registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(controller));

registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,

@@ -324,7 +324,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest {

ui_test_utils::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

- &tab_contents_wrapper->tab_contents()->GetController()));

+ &tab_contents_wrapper->tab_contents()->controller()));

if (allowed)

infobar_->AsConfirmInfoBarDelegate()->Accept();

else

@@ -507,7 +507,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,

ui_test_utils::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

- &current_browser_->GetSelectedTabContents()->GetController()));

+ &current_browser_->GetSelectedTabContents()->controller()));

NotifyGeoposition(fresh_position);

observer.Wait();

CheckGeoposition(fresh_position);

@@ -544,7 +544,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,

ui_test_utils::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

- &current_browser_->GetSelectedTabContents()->GetController()));

+ &current_browser_->GetSelectedTabContents()->controller()));

NotifyGeoposition(cached_position);

observer.Wait();

CheckGeoposition(cached_position);

@@ -652,7 +652,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) {

ui_test_utils::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

- &current_browser_->GetSelectedTabContents()->GetController()));

+ &current_browser_->GetSelectedTabContents()->controller()));

NotifyGeoposition(final_position);

observer.Wait();

CheckGeoposition(final_position);