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

chrome/browser/ui/search_engines/edit_search_engine_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/search_engines/edit_search_engine_controller.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 23 matching lines @@
 bool EditSearchEngineController::IsURLValid(
     const std::string& url_input) const {
   std::string url = GetFixedUpURL(url_input);
   if (url.empty())
     return false;
 
   // Convert |url| to a TemplateURLRef so we can check its validity even if it
   // contains replacement strings.  We do this by constructing a dummy
   // TemplateURL owner because |template_url_| might be NULL and we can't call
   // TemplateURLRef::IsValid() when its owner is NULL.
-  TemplateURL t_url;
-  t_url.SetURL(url);
+  TemplateURLData data;
+  data.SetURL(url);
+  TemplateURL t_url(data);
   const TemplateURLRef& template_ref = t_url.url_ref();
   if (!template_ref.IsValid())
     return false;
 
   // If this is going to be the default search engine, it must support
   // replacement.
   if (!template_ref.SupportsReplacement() &&
       (template_url_ == TemplateURLServiceFactory::GetForProfile(profile_)->
           GetDefaultSearchProvider()))
     return false;
@@ skipping 34 matching lines @@
     // TODO(pamg): Really, we should modify the entry so this later one
     // overwrites it. But we don't expect this case to be common.
     CleanUpCancelledAdd();
     return;
   }
 
   if (!edit_keyword_delegate_) {
     // Confiming an entry we got from JS. We have a template_url_, but it
     // hasn't yet been added to the model.
     DCHECK(template_url_);
-    // const_cast is ugly, but this is the same thing the TemplateURLService
-    // does in a similar situation (updating an existing TemplateURL with
-    // data from a new one).
-    TemplateURL* modifiable_url = const_cast<TemplateURL*>(template_url_);
-    modifiable_url->set_short_name(title_input);
-    modifiable_url->set_keyword(keyword_input);
-    modifiable_url->SetURL(url_string);
     // TemplateURLService takes ownership of template_url_.
-    template_url_service->Add(modifiable_url);
+    template_url_service->AddWithOverrides(template_url_, title_input,
+                                           keyword_input, url_string);
     content::RecordAction(UserMetricsAction("KeywordEditor_AddKeywordJS"));
   } else {
     // Adding or modifying an entry via the Delegate.
     edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
                                             keyword_input, url_string);
   }
 }
 
 void EditSearchEngineController::CleanUpCancelledAdd() {
   if (!edit_keyword_delegate_ && template_url_) {
     // When we have no Delegate, we know that the template_url_ hasn't yet been
     // added to the model, so we need to clean it up.
     delete template_url_;
     template_url_ = NULL;
   }
 }
 
 std::string EditSearchEngineController::GetFixedUpURL(
     const std::string& url_input) const {
   std::string url;
   TrimWhitespace(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url_input)),
                  TRIM_ALL, &url);
   if (url.empty())
     return url;
 
   // Parse the string as a URL to determine the scheme. If we need to, add the
   // scheme. As the scheme may be expanded (as happens with {google:baseURL})
   // we need to replace the search terms before testing for the scheme.
-  TemplateURL t_url;
-  t_url.SetURL(url);
+  TemplateURLData data;
+  data.SetURL(url);
+  TemplateURL t_url(data);
   std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(ASCIIToUTF16("x"),
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
   url_parse::Parsed parts;
   std::string scheme(URLFixerUpper::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid())
     url.insert(0, scheme + "://");
 
   return url;
 }