Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

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 129 matching lines @@
   std::string data;
   if (!source->GetStatus().is_success() ||
       ((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));
+  template_url_.reset(TemplateURLParser::Parse(fetcher_->profile(), false,
+      data.data(), data.length(), NULL));
   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
@@ skipping 25 matching lines @@
                                &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.
-  template_url_->set_keyword(keyword_);
-  template_url_->set_originating_url(osdd_url_);
+  TemplateURLData data(template_url_->data());
+  data.SetKeyword(keyword_);
+  data.originating_url = osdd_url_;
 
   // The page may have specified a URL to use for favicons, if not, set it.
-  if (!template_url_->favicon_url().is_valid())
-    template_url_->set_favicon_url(favicon_url_);
+  if (!data.favicon_url.is_valid())
+    data.favicon_url = favicon_url_;
 
   switch (provider_type_) {
     case AUTODETECTED_PROVIDER:
       // Mark the keyword as replaceable so it can be removed if necessary.
-      template_url_->set_safe_for_autoreplace(true);
-      model->Add(template_url_.release());
+      data.safe_for_autoreplace = true;
+      model->Add(new TemplateURL(data));
       break;
 
     case EXPLICIT_PROVIDER:
       // Confirm addition and allow user to edit default choices. It's ironic
       // that only *non*-autodetected additions get confirmed, but the user
       // expects feedback that his action did something.
       // The source TabContents' delegate takes care of adding the URL to the
       // model, which takes ownership, or of deleting it if the add is
       // cancelled.
-      callbacks_->ConfirmAddSearchProvider(template_url_.release(),
+      callbacks_->ConfirmAddSearchProvider(new TemplateURL(data),
                                            fetcher_->profile());
       break;
 
     default:
       NOTREACHED();
       break;
   }
 
   fetcher_->RequestCompleted(this);
   // WARNING: RequestCompleted deletes us.
@@ skipping 56 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;
 }