Move most TemplateURL data members to a new struct, TemplateURLData. This allows us to eliminate t…

chrome/browser/search_engines/template_url_parser_unittest.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 "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_parser.h"
@@ skipping 81 matching lines @@
     const std::string& file_name,
     TemplateURLParser::ParameterFilter* filter) {
   FilePath full_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &full_path));
   full_path = full_path.AppendASCII("osdd");
   full_path = full_path.AppendASCII(file_name);
   ASSERT_TRUE(file_util::PathExists(full_path));
 
   std::string contents;
   ASSERT_TRUE(file_util::ReadFileToString(full_path, &contents));
-  template_url_.reset(TemplateURLParser::Parse(NULL, contents.data(),
+  template_url_.reset(TemplateURLParser::Parse(NULL, false, contents.data(),
                                                contents.length(), filter));
 }
 
 
 // Actual tests ---------------------------------------------------------------
 
 TEST_F(TemplateURLParserTest, FailOnBogusURL) {
   if (is_disabled())
     return;
   ASSERT_NO_FATAL_FAILURE(ParseFile("bogus.xml", NULL));
@@ skipping 137 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_->short_name());
   EXPECT_TRUE(template_url_->url_ref().SupportsReplacement());
   EXPECT_TRUE(template_url_->suggestions_url().empty());
   EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",
             template_url_->url());
   ASSERT_EQ(1U, template_url_->input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_->input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
             template_url_->favicon_url());
 }