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

chrome/browser/ui/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1613 matching lines @@
   const CommandLine::StringVector& params = command_line.GetArgs();
 
   for (size_t i = 0; i < params.size(); ++i) {
     FilePath param = FilePath(params[i]);
     // Handle Vista way of searching - "? <search-term>"
     if (param.value().size() > 2 &&
         param.value()[0] == '?' && param.value()[1] == ' ') {
       const TemplateURL* default_provider =
           TemplateURLServiceFactory::GetForProfile(profile)->
           GetDefaultSearchProvider();
-      if (default_provider && !default_provider->url().empty()) {
-        const TemplateURLRef& search_url = default_provider->url_ref();
-        DCHECK(search_url.SupportsReplacement());
+      if (default_provider && default_provider->url()) {
+        const TemplateURLRef* search_url = default_provider->url();
+        DCHECK(search_url->SupportsReplacement());
         string16 search_term = param.LossyDisplayName().substr(2);
-        urls.push_back(GURL(search_url.ReplaceSearchTermsUsingProfile(
+        urls.push_back(GURL(search_url->ReplaceSearchTermsUsingProfile(
             profile, search_term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
             string16())));
         continue;
       }
     }
 
     // Otherwise, fall through to treating it as a URL.
 
     // This will create a file URL or a regular URL.
     // This call can (in rare circumstances) block the UI thread.
@@ skipping 262 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }