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

content/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 94 matching lines @@
 // In this case the old RVH has been swapped out but the new one has not
 // replaced it, yet. Therefore, we cancel the pending RVH and skip the unloading
 // of the old RVH.
 
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::DevToolsManagerImpl;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::GlobalRequestID;
+using content::NavigationController;
 using content::NavigationEntry;
 using content::NavigationEntryImpl;
 using content::OpenURLParams;
 using content::SSLStatus;
 using content::UserMetricsAction;
 using content::WebContents;
 using content::WebContentsObserver;
 
 namespace {
 
@@ skipping 10 matching lines @@
 BOOL CALLBACK InvalidateWindow(HWND hwnd, LPARAM lparam) {
   // Note: erase is required to properly paint some widgets borders. This can
   // be seen with textfields.
   InvalidateRect(hwnd, NULL, TRUE);
   return TRUE;
 }
 #endif
 
 ViewMsg_Navigate_Type::Value GetNavigationType(
     content::BrowserContext* browser_context, const NavigationEntryImpl& entry,
-    content::NavigationController::ReloadType reload_type) {
+    NavigationController::ReloadType reload_type) {
   switch (reload_type) {
     case NavigationControllerImpl::RELOAD:
       return ViewMsg_Navigate_Type::RELOAD;
     case NavigationControllerImpl::RELOAD_IGNORING_CACHE:
       return ViewMsg_Navigate_Type::RELOAD_IGNORING_CACHE;
     case NavigationControllerImpl::NO_RELOAD:
       break;  // Fall through to rest of function.
   }
 
   if (entry.restore_type() == NavigationEntryImpl::RESTORE_LAST_SESSION &&
       browser_context->DidLastSessionExitCleanly())
     return ViewMsg_Navigate_Type::RESTORE;
 
   return ViewMsg_Navigate_Type::NORMAL;
 }
 
 void MakeNavigateParams(const NavigationEntryImpl& entry,
                         const NavigationControllerImpl& controller,
                         content::WebContentsDelegate* delegate,
-                        content::NavigationController::ReloadType reload_type,
+                        NavigationController::ReloadType reload_type,
                         ViewMsg_Navigate_Params* params) {
   params->page_id = entry.GetPageID();
   params->pending_history_list_offset = controller.GetIndexOfEntry(&entry);
   params->current_history_list_offset = controller.GetLastCommittedEntryIndex();
   params->current_history_list_length = controller.GetEntryCount();
   params->url = entry.GetURL();
   params->referrer = entry.GetReferrer();
   params->transition = entry.GetTransitionType();
   params->state = entry.GetContentState();
   params->navigation_type =
@@ skipping 173 matching lines @@
 
   return handled;
 }
 
 void TabContents::RunFileChooser(
     RenderViewHost* render_view_host,
     const content::FileChooserParams& params) {
   delegate_->RunFileChooser(this, params);
 }
 
-content::NavigationController& TabContents::GetController() {
+NavigationController& TabContents::GetController() {
   return controller_;
 }
 
-const content::NavigationController& TabContents::GetController() const {
+const NavigationController& TabContents::GetController() const {
   return controller_;
 }
 
 content::BrowserContext* TabContents::GetBrowserContext() const {
   return controller_.GetBrowserContext();
 }
 
 void TabContents::SetViewType(content::ViewType type) {
   view_type_ = type;
 }
@@ skipping 402 matching lines @@
 
   WebContents* new_contents = delegate_->OpenURLFromTab(this, params);
   // Notify observers.
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidOpenURL(params.url, params.referrer,
                                params.disposition, params.transition));
   return new_contents;
 }
 
 bool TabContents::NavigateToPendingEntry(
-    content::NavigationController::ReloadType reload_type) {
+    NavigationController::ReloadType reload_type) {
   return NavigateToEntry(
       *NavigationEntryImpl::FromNavigationEntry(controller_.GetPendingEntry()),
       reload_type);
 }
 
 bool TabContents::NavigateToEntry(
     const NavigationEntryImpl& entry,
-    content::NavigationController::ReloadType reload_type) {
+    NavigationController::ReloadType reload_type) {
   // The renderer will reject IPC messages with URLs longer than
   // this limit, so don't attempt to navigate with a longer URL.
   if (entry.GetURL().spec().size() > content::kMaxURLChars)
     return false;
 
   RenderViewHost* dest_render_view_host = render_manager_.Navigate(entry);
   if (!dest_render_view_host)
     return false;  // Unable to create the desired render view host.
 
   // For security, we should never send non-Web-UI URLs to a Web UI renderer.
@@ skipping 434 matching lines @@
       params.is_main_frame,
       controller_.IsURLInPageNavigation(validated_url),
       validated_url,
       std::string(),
       false,
       params.frame_id);
   details.set_error_code(params.error_code);
 
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
-      content::Source<content::NavigationController>(&controller_),
+      content::Source<NavigationController>(&controller_),
       content::Details<ProvisionalLoadDetails>(&details));
 
   FOR_EACH_OBSERVER(WebContentsObserver,
                     observers_,
                     DidFailProvisionalLoad(params.frame_id,
                                            params.is_main_frame,
                                            validated_url,
                                            params.error_code,
                                            params.error_description));
 }
@@ skipping 13 matching lines @@
   int connection_status = 0;
   SSLManager::DeserializeSecurityInfo(security_info,
                                       &cert_id, &cert_status,
                                       &security_bits,
                                       &connection_status);
   LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->GetID(),
                                      cert_id, cert_status);
 
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
-      content::Source<content::NavigationController>(&controller_),
+      content::Source<NavigationController>(&controller_),
       content::Details<LoadFromMemoryCacheDetails>(&details));
 }
 
 void TabContents::OnDidDisplayInsecureContent() {
   content::RecordAction(UserMetricsAction("SSL.DisplayedInsecureContent"));
   displayed_insecure_content_ = true;
   SSLManager::NotifySSLInternalStateChanged(&GetControllerImpl());
 }
 
 void TabContents::OnDidRunInsecureContent(
@@ skipping 141 matching lines @@
   if (delegate_)
     delegate_->LoadingStateChanged(this);
   NotifyNavigationStateChanged(INVALIDATE_LOAD);
 
   int type = is_loading ? content::NOTIFICATION_LOAD_START :
       content::NOTIFICATION_LOAD_STOP;
   content::NotificationDetails det = content::NotificationService::NoDetails();
   if (details)
       det = content::Details<LoadNotificationDetails>(details);
   content::NotificationService::current()->Notify(type,
-      content::Source<content::NavigationController>(&controller_),
+      content::Source<NavigationController>(&controller_),
       det);
 }
 
 void TabContents::DidNavigateMainFramePostCommit(
     const content::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   if (opener_web_ui_type_ != WebUI::kNoWebUI) {
     // If this is a window.open navigation, use the same WebUI as the renderer
     // that opened the window, as long as both renderers have the same
     // privileges.
@@ skipping 773 matching lines @@
   encoding_ = content::GetContentClient()->browser()->
       GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }