diff options
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_browsertest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 3c2cc59..7d5cd85 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -35,6 +35,7 @@ #include "net/base/net_util.h" #include "net/test/test_server.h" +using content::NavigationController; using content::WebContents; namespace { @@ -48,10 +49,10 @@ class IFrameLoader : public content::NotificationObserver { IFrameLoader(Browser* browser, int iframe_id, const GURL& url) : navigation_completed_(false), javascript_completed_(false) { - content::NavigationController* controller = + NavigationController* controller = &browser->GetSelectedWebContents()->GetController(); registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>(controller)); + content::Source<NavigationController>(controller)); registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE, content::NotificationService::AllSources()); std::string script = base::StringPrintf( @@ -326,7 +327,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( &tab_contents_wrapper->web_contents()->GetController())); if (allowed) infobar_->AsConfirmInfoBarDelegate()->Accept(); @@ -509,7 +510,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, Geoposition fresh_position = GeopositionFromLatLong(3.17, 4.23); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( ¤t_browser_->GetSelectedWebContents()->GetController())); NotifyGeoposition(fresh_position); observer.Wait(); @@ -546,7 +547,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, Geoposition cached_position = GeopositionFromLatLong(5.67, 8.09); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( ¤t_browser_->GetSelectedWebContents()->GetController())); NotifyGeoposition(cached_position); observer.Wait(); @@ -654,7 +655,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) { // its way through to the first watcher. ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( ¤t_browser_->GetSelectedWebContents()->GetController())); NotifyGeoposition(final_position); observer.Wait(); |