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

chrome/browser/policy/configuration_policy_handler.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/policy/configuration_policy_handler.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/json/json_writer.h"
@@ skipping 579 matching lines @@
          !enabled;
 }
 
 bool DefaultSearchPolicyHandler::DefaultSearchURLIsValid(
     const PolicyMap& policies,
     const Value** url_value,
     std::string* url_string) {
   *url_value = policies.GetValue(key::kDefaultSearchProviderSearchURL);
   if (!*url_value || !(*url_value)->GetAsString(url_string))
     return false;
-  TemplateURL t_url;
-  t_url.SetURL(*url_string);
+  TemplateURLData data;
+  data.SetURL(*url_string);
   SearchTermsData search_terms_data;
-  return t_url.url_ref().SupportsReplacementUsingTermsData(search_terms_data);
+  return TemplateURL(data).SupportsReplacementUsingTermsData(search_terms_data);
 }
 
 void DefaultSearchPolicyHandler::EnsureStringPrefExists(
     PrefValueMap* prefs,
     const std::string& path) {
   std::string value;
   if (!prefs->GetString(path, &value))
     prefs->SetString(path, value);
 }
 
@@ skipping 386 matching lines @@
         errors->AddError(key::kClearSiteDataOnExit,
                          IDS_POLICY_OVERRIDDEN,
                          key::kRestoreOnStartup);
       }
     }
   }
   return true;
 }
 
 }  // namespace policy