| Index: chrome/browser/geolocation/geolocation_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/geolocation/geolocation_browsertest.cc (revision 115228)
|
| +++ chrome/browser/geolocation/geolocation_browsertest.cc (working copy)
|
| @@ -46,7 +46,7 @@
|
| : navigation_completed_(false),
|
| javascript_completed_(false) {
|
| NavigationController* controller =
|
| - &browser->GetSelectedTabContents()->controller();
|
| + &browser->GetSelectedTabContents()->GetController();
|
| registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(controller));
|
| registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,
|
| @@ -324,7 +324,7 @@
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(
|
| - &tab_contents_wrapper->tab_contents()->controller()));
|
| + &tab_contents_wrapper->tab_contents()->GetController()));
|
| if (allowed)
|
| infobar_->AsConfirmInfoBarDelegate()->Accept();
|
| else
|
| @@ -507,7 +507,7 @@
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(
|
| - ¤t_browser_->GetSelectedTabContents()->controller()));
|
| + ¤t_browser_->GetSelectedTabContents()->GetController()));
|
| NotifyGeoposition(fresh_position);
|
| observer.Wait();
|
| CheckGeoposition(fresh_position);
|
| @@ -544,7 +544,7 @@
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(
|
| - ¤t_browser_->GetSelectedTabContents()->controller()));
|
| + ¤t_browser_->GetSelectedTabContents()->GetController()));
|
| NotifyGeoposition(cached_position);
|
| observer.Wait();
|
| CheckGeoposition(cached_position);
|
| @@ -652,7 +652,7 @@
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(
|
| - ¤t_browser_->GetSelectedTabContents()->controller()));
|
| + ¤t_browser_->GetSelectedTabContents()->GetController()));
|
| NotifyGeoposition(final_position);
|
| observer.Wait();
|
| CheckGeoposition(final_position);
|
|
|