Get rid of content::NavigationController in cc file and use "using" instead.

chrome/browser/ui/toolbar/toolbar_model.cc

Index: chrome/browser/ui/toolbar/toolbar_model.cc
===================================================================
--- chrome/browser/ui/toolbar/toolbar_model.cc	(revision 116288)
+++ chrome/browser/ui/toolbar/toolbar_model.cc	(working copy)
@@ -27,6 +27,7 @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::NavigationController;
 using content::NavigationEntry;
 using content::SSLStatus;
 using content::WebContents;
@@ -44,8 +45,7 @@
   GURL url(chrome::kAboutBlankURL);
   std::string languages;  // Empty if we don't have a |navigation_controller|.
 
-  content::NavigationController* navigation_controller =
-      GetNavigationController();
+  NavigationController* navigation_controller = GetNavigationController();
   if (navigation_controller) {
     Profile* profile =
         Profile::FromBrowserContext(navigation_controller->GetBrowserContext());
@@ -75,8 +75,7 @@
   // - The view-source test must come before the WebUI test because of the case
   //   of view-source:chrome://newtab, which should display its URL despite what
   //   chrome://newtab's WebUI says.
-  content::NavigationController* controller =
-      GetNavigationController();
+  NavigationController* controller = GetNavigationController();
   NavigationEntry* entry = controller ? controller->GetVisibleEntry() : NULL;
   if (entry) {
     if (entry->IsViewSourceMode() ||
@@ -99,8 +98,7 @@
   if (input_in_progress_)  // When editing, assume no security style.
     return NONE;
 
-  content::NavigationController* navigation_controller =
-      GetNavigationController();
+  NavigationController* navigation_controller = GetNavigationController();
   if (!navigation_controller)  // We might not have a controller on init.
     return NONE;
 
@@ -172,7 +170,7 @@
       UTF8ToUTF16(cert.subject().country_name));
 }
 
-content::NavigationController* ToolbarModel::GetNavigationController() const {
+NavigationController* ToolbarModel::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).