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

chrome/browser/importer/profile_writer.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/importer/profile_writer.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 237 matching lines @@
 // If |try_url_if_invalid| is true, and |t_url| isn't valid, a string is built
 // from the raw TemplateURL string. Use a value of true for |try_url_if_invalid|
 // when checking imported URLs as the imported URL may not be valid yet may
 // match the host+path of one of the default URLs. This is used to catch the
 // case of IE using an invalid OSDD URL for Live Search, yet the host+path
 // matches our prepopulate data. IE's URL for Live Search is something like
 // 'http://...{Language}...'. As {Language} is not a valid OSDD parameter value
 // the TemplateURL is invalid.
 static std::string BuildHostPathKey(const TemplateURL* t_url,
                                     bool try_url_if_invalid) {
-  if (!t_url->url().empty()) {
-    if (try_url_if_invalid && !t_url->url_ref().IsValid())
-      return HostPathKeyForURL(GURL(t_url->url()));
+  if (t_url->url()) {
+    if (try_url_if_invalid && !t_url->url()->IsValid())
+      return HostPathKeyForURL(GURL(t_url->url()->url()));
 
-    if (t_url->url_ref().SupportsReplacement()) {
+    if (t_url->url()->SupportsReplacement()) {
       return HostPathKeyForURL(GURL(
-          t_url->url_ref().ReplaceSearchTerms(ASCIIToUTF16("x"),
+          t_url->url()->ReplaceSearchTerms(ASCIIToUTF16("x"),
               TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())));
     }
   }
   return std::string();
 }
 
 // Builds a set that contains an entry of the host+path for each TemplateURL in
 // the TemplateURLService that has a valid search url.
 static void BuildHostPathMap(TemplateURLService* model,
                              HostPathMap* host_path_map) {
@@ skipping 35 matching lines @@
     // For search engines if there is already a keyword with the same
     // host+path, we don't import it. This is done to avoid both duplicate
     // search providers (such as two Googles, or two Yahoos) as well as making
     // sure the search engines we provide aren't replaced by those from the
     // imported browser.
     if (unique_on_host_and_path &&
         (host_path_map.find(BuildHostPathKey(*i, true)) != host_path_map.end()))
       continue;
 
     // Only add valid TemplateURLs to the model.
-    if (!(*i)->url().empty() && (*i)->url_ref().IsValid()) {
+    if ((*i)->url() && (*i)->url()->IsValid()) {
       model->Add(*i);  // Takes ownership.
       *i = NULL;       // Prevent the vector from deleting *i later.
     }
   }
 }
 
 ProfileWriter::~ProfileWriter() {}