Get rid of a bunch of view_messages.h includes from chrome by making the TabContentsObserver inte...

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/common/view_messages.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/common/frame_navigate_params.h"
 
 namespace {
 
 // Returns true if the entry's transition type is FORM_SUBMIT.
 bool IsFormSubmit(const NavigationEntry* entry) {
   return (content::PageTransitionStripQualifier(entry->transition_type()) ==
           content::PAGE_TRANSITION_FORM_SUBMIT);
 }
 
 }  // namespace
 
 SearchEngineTabHelper::SearchEngineTabHelper(TabContents* tab_contents)
     : TabContentsObserver(tab_contents) {
   DCHECK(tab_contents);
 }
 
 SearchEngineTabHelper::~SearchEngineTabHelper() {
 }
 
 void SearchEngineTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& /*details*/,
-    const ViewHostMsg_FrameNavigate_Params& params) {
+    const content::FrameNavigateParams& params) {
   GenerateKeywordIfNecessary(params);
 }
 
 bool SearchEngineTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchEngineTabHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageHasOSDD, OnPageHasOSDD)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
@@ skipping 72 matching lines @@
   // new keyword will be created when done.
   profile->GetTemplateURLFetcher()->ScheduleDownload(
       keyword,
       doc_url,
       base_entry->favicon().url(),
       new TemplateURLFetcherUICallbacks(this, tab_contents()),
       provider_type);
 }
 
 void SearchEngineTabHelper::GenerateKeywordIfNecessary(
-    const ViewHostMsg_FrameNavigate_Params& params) {
+    const content::FrameNavigateParams& params) {
   if (!params.searchable_form_url.is_valid())
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(tab_contents()->browser_context());
   if (profile->IsOffTheRecord())
     return;
 
   const NavigationController& controller = tab_contents()->controller();
   int last_index = controller.last_committed_entry_index();
@@ skipping 55 matching lines @@
     // The favicon url isn't valid. This means there really isn't a favicon,
     // 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));
   }
   new_url->set_safe_for_autoreplace(true);
   url_service->Add(new_url);
 }