Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

chrome/browser/omnibox_search_hint.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/omnibox_search_hint.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
@@ skipping 172 matching lines @@
         search_engine_urls_.end()) {
       // The search engine is not in our white-list, bail.
       return;
     }
     const TemplateURL* const default_provider =
         TemplateURLServiceFactory::GetForProfile(tab_->profile())->
         GetDefaultSearchProvider();
     if (!default_provider)
       return;
 
-    if (default_provider->url()->GetHost() == entry->GetURL().host())
+    if (default_provider->url_ref().GetHost() == entry->GetURL().host())
       ShowInfoBar();
   } else if (type == chrome::NOTIFICATION_OMNIBOX_OPENED_URL) {
     AutocompleteLog* log = content::Details<AutocompleteLog>(details).ptr();
     AutocompleteMatch::Type type =
         log->result.match_at(log->selected_index).type;
     if (type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED ||
         type == AutocompleteMatch::SEARCH_HISTORY ||
         type == AutocompleteMatch::SEARCH_SUGGEST) {
       // The user performed a search from the omnibox, don't show the infobar
       // again.
@@ skipping 29 matching lines @@
 }
 
 // static
 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
   // The infobar can only be shown if the correct switch has been provided and
   // the user did not dismiss the infobar before.
   return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
       CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSearchInOmniboxHint);
 }