Remove render_messages_params files since they're not needed anymore. I moved the search provide...

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_model.h"
@@ skipping 32 matching lines @@
     IPC_MESSAGE_HANDLER(ViewHostMsg_PageHasOSDD, OnPageHasOSDD)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void SearchEngineTabHelper::OnPageHasOSDD(
     int32 page_id,
     const GURL& doc_url,
-    const ViewHostMsg_PageHasOSDD_Type& msg_provider_type) {
+    const search_provider::OSDDType& msg_provider_type) {
   // Checks to see if we should generate a keyword based on the OSDD, and if
   // necessary uses TemplateURLFetcher to download the OSDD and create a
   // keyword.
 
   // Make sure page_id is the current page and other basic checks.
   DCHECK(doc_url.is_valid());
   if (!tab_contents()->IsActiveEntry(page_id))
     return;
   if (!tab_contents()->profile()->GetTemplateURLFetcher())
     return;
   if (tab_contents()->profile()->IsOffTheRecord())
     return;
 
   TemplateURLFetcher::ProviderType provider_type;
-  switch (msg_provider_type.type) {
-    case ViewHostMsg_PageHasOSDD_Type::AUTODETECTED_PROVIDER:
+  switch (msg_provider_type) {
+    case search_provider::AUTODETECTED_PROVIDER:
       provider_type = TemplateURLFetcher::AUTODETECTED_PROVIDER;
       break;
 
-    case ViewHostMsg_PageHasOSDD_Type::EXPLICIT_DEFAULT_PROVIDER:
+    case search_provider::EXPLICIT_DEFAULT_PROVIDER:
       provider_type = TemplateURLFetcher::EXPLICIT_DEFAULT_PROVIDER;
       break;
 
-    case ViewHostMsg_PageHasOSDD_Type::EXPLICIT_PROVIDER:
+    case search_provider::EXPLICIT_PROVIDER:
       provider_type = TemplateURLFetcher::EXPLICIT_PROVIDER;
       break;
 
     default:
       NOTREACHED();
       return;
   }
 
   const NavigationController& controller = tab_contents()->controller();
   const NavigationEntry* entry = controller.GetLastCommittedEntry();
@@ skipping 103 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_model->Add(new_url);
 }