Changes SearchProvider to set the description of the first consecutive

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
@@ skipping 660 matching lines @@
       show_timer_.Start(
           base::TimeDelta::FromMilliseconds(kShowDelayMS),
           this, &InstantController::ShowTimerFired);
     }
   }
   UpdateDisplayableLoader();
 }
 
 InstantController::PreviewCondition InstantController::GetPreviewConditionFor(
     const AutocompleteMatch& match, const TemplateURL** template_url) {
-  const TemplateURL* t_url = GetTemplateURL(match);
+  const TemplateURL* t_url = match.template_url;
   if (t_url) {
     if (!t_url->id() ||
         !t_url->instant_url() ||
         IsBlacklistedFromInstant(t_url->id()) ||
         !t_url->instant_url()->SupportsReplacement()) {
       // To avoid extra load on other search engines we only enable previews if
       // they support the instant API.
       return PREVIEW_CONDITION_INVALID_TEMPLATE_URL;
     }
   }
@@ skipping 39 matching lines @@
   if (destroy_factory_.empty()) {
     MessageLoop::current()->PostTask(
         FROM_HERE, destroy_factory_.NewRunnableMethod(
             &InstantController::DestroyLoaders));
   }
 }
 
 void InstantController::DestroyLoaders() {
   loaders_to_destroy_.reset();
 }
-
-const TemplateURL* InstantController::GetTemplateURL(
-    const AutocompleteMatch& match) {
-  const TemplateURL* template_url = match.template_url;
-  if (match.type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED ||
-      match.type == AutocompleteMatch::SEARCH_HISTORY ||
-      match.type == AutocompleteMatch::SEARCH_SUGGEST) {
-    TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
-        tab_contents_->profile());
-    template_url = model ? model->GetDefaultSearchProvider() : NULL;
-  }
-  return template_url;
-}