alternate ntp: persist show-search-provider-logo option at chrome://instant

chrome/browser/ui/views/search_view_controller.cc

 // Copyright (c) 2012 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/views/search_view_controller.h"
 
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 457 matching lines @@
   ntp_container_ = new views::View;
   ntp_container_->set_background(new NTPViewBackground);
   ntp_container_->SetPaintToLayer(true);
   ntp_container_->layer()->SetMasksToBounds(true);
 
   const TemplateURL* default_provider =
       TemplateURLServiceFactory::GetForProfile(
           Profile::FromBrowserContext(browser_context_))->
               GetDefaultSearchProvider();
 
-  if (default_provider && InstantUI::ShouldShowSearchProviderLogo() &&
+  if (default_provider &&
+      InstantUI::ShouldShowSearchProviderLogo(browser_context_) &&
       (TemplateURLPrepopulateData::GetEngineType(default_provider->url()) ==
        SEARCH_ENGINE_GOOGLE)) {
     default_provider_logo_.reset(new views::ImageView());
     default_provider_logo_->set_owned_by_client();
     default_provider_logo_->SetImage(ui::ResourceBundle::GetSharedInstance().
                                          GetImageSkiaNamed(IDR_GOOGLE_LOGO_LG));
     default_provider_logo_->SetPaintToLayer(true);
     default_provider_logo_->SetFillsBoundsOpaquely(false);
   }
 
@@ skipping 113 matching lines @@
 
 chrome::search::SearchModel* SearchViewController::search_model() {
   return tab_contents_ ? chrome::search::SearchTabHelper::FromWebContents(
                              tab_contents_->web_contents())->model()
                        : NULL;
 }
 
 content::WebContents* SearchViewController::web_contents() {
   return tab_contents_ ? tab_contents_->web_contents() : NULL;
 }