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

chrome/browser/search_engines/template_url_fetcher.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 "build/build_config.h"
 
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 131 matching lines @@
       ((source->GetResponseCode() != -1) &&
         (source->GetResponseCode() != 200)) ||
       !source->GetResponseAsString(&data)) {
     fetcher_->RequestCompleted(this);
     // WARNING: RequestCompleted deletes us.
     return;
   }
 
   template_url_.reset(TemplateURLParser::Parse(fetcher_->profile(), data.data(),
                                                data.length(), NULL));
-  if (!template_url_.get() || !template_url_->url()->SupportsReplacement()) {
+  if (!template_url_.get() || !template_url_->url_ref().SupportsReplacement()) {
     fetcher_->RequestCompleted(this);
     // WARNING: RequestCompleted deletes us.
     return;
   }
 
   if (provider_type_ != AUTODETECTED_PROVIDER || keyword_.empty()) {
     // Use the parser-generated new keyword from the URL in the OSDD for the
     // non-autodetected case.  The existing |keyword_| was generated from the
     // URL that hosted the OSDD, which results in the wrong keyword when the
     // OSDD was located on a third-party site that has nothing in common with
@@ skipping 13 matching lines @@
 
 void TemplateURLFetcher::RequestDelegate::AddSearchProvider() {
   DCHECK(template_url_.get());
   DCHECK(!keyword_.empty());
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       fetcher_->profile());
   DCHECK(model);
   DCHECK(model->loaded());
 
   const TemplateURL* existing_url = NULL;
-  if (model->CanReplaceKeyword(keyword_, GURL(template_url_->url()->url()),
+  if (model->CanReplaceKeyword(keyword_, GURL(template_url_->url()),
                                &existing_url)) {
     if (existing_url)
       model->Remove(existing_url);
   } else if (provider_type_ == AUTODETECTED_PROVIDER) {
     fetcher_->RequestCompleted(this);  // WARNING: Deletes us!
     return;
   }
 
   // The short name is what is shown to the user. We preserve original names
   // since it is better when generated keyword in many cases.
@@ skipping 88 matching lines @@
                           owned_callbacks.release(), provider_type));
 }
 
 void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
   Requests::iterator i =
       std::find(requests_->begin(), requests_->end(), request);
   DCHECK(i != requests_->end());
   requests_->erase(i);
   delete request;
 }