From c5eed4976490f601ad01f36e102260744c673b2d Mon Sep 17 00:00:00 2001
From: "jam@chromium.org"
 <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 4 Jan 2012 17:07:50 +0000
Subject: Get rid of content::NavigationController in cc file and use "using"
 instead.

BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8983012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116328 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/geolocation/geolocation_browsertest.cc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'chrome/browser/geolocation')

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>(
           &current_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>(
           &current_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>(
           &current_browser_->GetSelectedWebContents()->GetController()));
   NotifyGeoposition(final_position);
   observer.Wait();
-- 
cgit v1.1