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

chrome/browser/ui/search_engines/template_url_table_model.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/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
@@ skipping 64 matching lines @@
   void LoadFavicon() {
     load_state_ = LOADED;
     FaviconService* favicon_service =
         model_->template_url_service()->profile()->GetFaviconService(
             Profile::EXPLICIT_ACCESS);
     if (!favicon_service)
       return;
     GURL favicon_url = template_url()->favicon_url();
     if (!favicon_url.is_valid()) {
       // The favicon url isn't always set. Guess at one here.
-      if (template_url_->url() && template_url_->url()->IsValid()) {
-        GURL url(template_url_->url()->url());
+      if (template_url_->url_ref().IsValid()) {
+        GURL url(template_url_->url());
         if (url.is_valid())
           favicon_url = TemplateURL::GenerateFaviconURL(url);
       }
       if (!favicon_url.is_valid())
         return;
     }
     load_state_ = LOADING;
     favicon_service->GetFavicon(favicon_url, history::FAVICON,
         &request_consumer_,
         base::Bind(&ModelEntry::OnFaviconDataAvailable,
@@ skipping 269 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }