Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

chrome/browser/protector/histograms.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/protector/histograms.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 
@@ skipping 27 matching lines @@
 const char kProtectorHistogramStartupSettingsChanged[] =
     "Protector.StartupSettings.Changed";
 const char kProtectorHistogramStartupSettingsDiscarded[] =
     "Protector.StartupSettings.Discarded";
 const char kProtectorHistogramStartupSettingsTimeout[] =
     "Protector.StartupSettings.Timeout";
 
 const int kProtectorMaxSearchProviderID = SEARCH_ENGINE_MAX;
 
 int GetSearchProviderHistogramID(const TemplateURL* t_url) {
-  return (t_url && t_url->url()) ?
-      TemplateURLPrepopulateData::GetEngineType(t_url->url()->url()) :
+  return t_url ?
+      TemplateURLPrepopulateData::GetEngineType(t_url->url()) :
       SEARCH_ENGINE_NONE;
 }
 
 }  // namespace protector