Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/tabs/tab_finder.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 "chrome/browser/tabs/tab_finder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/page_transition_types.h"
 
+using content::NavigationEntry;
 using content::WebContents;
 
 class TabFinder::WebContentsObserverImpl : public content::WebContentsObserver {
  public:
   WebContentsObserverImpl(WebContents* tab, TabFinder* finder);
   virtual ~WebContentsObserverImpl();
 
   WebContents* web_contents() {
     return content::WebContentsObserver::web_contents();
   }
@@ skipping 167 matching lines @@
       history->CancelRequest(request_handle);
     }
   }
 }
 
 void TabFinder::FetchRedirectStart(WebContents* tab) {
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
   if (profile->IsOffTheRecord())
     return;
 
-  content::NavigationEntry* committed_entry =
+  NavigationEntry* committed_entry =
       tab->GetController().GetLastCommittedEntry();
   if (!committed_entry || committed_entry->GetURL().is_empty())
     return;
 
   HistoryService* history = profile->GetHistoryService(
       Profile::EXPLICIT_ACCESS);
   if (history) {
     CancelableRequestProvider::Handle request_handle =
         history->QueryRedirectsTo(
             committed_entry->GetURL(),
             &callback_consumer_,
             base::Bind(&TabFinder::QueryRedirectsToComplete,
                        base::Unretained(this)));
     callback_consumer_.SetClientData(history, request_handle, tab);
   }
 }
 
 void TabFinder::QueryRedirectsToComplete(HistoryService::Handle handle,
                                          GURL url,
                                          bool success,
                                          history::RedirectList* redirects) {
   if (success && !redirects->empty()) {
     WebContents* web_contents =
         callback_consumer_.GetClientDataForCurrentRequest();
     DCHECK(web_contents);
     web_contents_to_url_[web_contents] = redirects->back();
   }
 }