Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

chrome/browser/ui/search_engines/keyword_editor_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/keyword_editor_controller.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 45 matching lines @@
                                                 const std::string& url) {
   const int index = table_model_->IndexOfTemplateURL(template_url);
   if (index == -1) {
     // Will happen if url was deleted out from under us while the user was
     // editing it.
     return;
   }
 
   // Don't do anything if the entry didn't change.
   if ((template_url->short_name() == title) &&
-      (template_url->keyword() == keyword) && (template_url->url() == url))
+      (template_url->keyword() == keyword) &&
+      ((url.empty() && !template_url->url()) ||
+       (!url.empty() && template_url->url() &&
+        template_url->url()->url() == url)))
     return;
 
   table_model_->ModifyTemplateURL(index, title, keyword, url);
 
   content::RecordAction(UserMetricsAction("KeywordEditor_ModifiedKeyword"));
 }
 
 bool KeywordEditorController::CanEdit(const TemplateURL* url) const {
   return !url_model()->is_default_search_managed() ||
       url != url_model()->GetDefaultSearchProvider();
@@ skipping 20 matching lines @@
   return url_model()->loaded();
 }
 
 const TemplateURL* KeywordEditorController::GetTemplateURL(int index) const {
   return table_model_->GetTemplateURL(index);
 }
 
 TemplateURLService* KeywordEditorController::url_model() const {
   return table_model_->template_url_service();
 }