Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/ui/search_engines/search_engine_tab_helper.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/ui/search_engines/search_engine_tab_helper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h"
 #include "chrome/common/render_messages.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/public/browser/favicon_status.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 
 using content::NavigationEntry;
 using content::WebContents;
 
 namespace {
 
 // Returns true if the entry's transition type is FORM_SUBMIT.
@@ skipping 59 matching lines @@
 
     case search_provider::EXPLICIT_PROVIDER:
       provider_type = TemplateURLFetcher::EXPLICIT_PROVIDER;
       break;
 
     default:
       NOTREACHED();
       return;
   }
 
-  const NavigationController& controller = web_contents()->GetController();
+  const content::NavigationController& controller =
+      web_contents()->GetController();
   const NavigationEntry* entry = controller.GetLastCommittedEntry();
   DCHECK(entry);
 
   const NavigationEntry* base_entry = entry;
   if (IsFormSubmit(base_entry)) {
     // If the current page is a form submit, find the last page that was not
     // a form submit and use its url to generate the keyword from.
     int index = controller.GetLastCommittedEntryIndex() - 1;
     while (index >= 0 && IsFormSubmit(controller.GetEntryAtIndex(index)))
       index--;
@@ skipping 29 matching lines @@
 void SearchEngineTabHelper::GenerateKeywordIfNecessary(
     const content::FrameNavigateParams& params) {
   if (!params.searchable_form_url.is_valid())
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (profile->IsOffTheRecord())
     return;
 
-  const NavigationController& controller = web_contents()->GetController();
+  const content::NavigationController& controller =
+      web_contents()->GetController();
   int last_index = controller.GetLastCommittedEntryIndex();
   // When there was no previous page, the last index will be 0. This is
   // normally due to a form submit that opened in a new tab.
   // TODO(brettw) bug 916126: we should support keywords when form submits
   //              happen in new tabs.
   if (last_index <= 0)
     return;
   const NavigationEntry* previous_entry =
       controller.GetEntryAtIndex(last_index - 1);
   if (IsFormSubmit(previous_entry)) {
@@ skipping 47 matching lines @@
     // or the favicon url wasn't obtained before the load started. This assumes
     // the later.
     // TODO(sky): Need a way to set the favicon that doesn't involve generating
     // its url.
     new_url->SetFaviconURL(
         TemplateURL::GenerateFaviconURL(params.referrer.url));
   }
   new_url->set_safe_for_autoreplace(true);
   url_service->Add(new_url);
 }