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

chrome/browser/ui/search_engines/keyword_editor_controller_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/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 227 matching lines @@
   ClearChangeCount();
 
   // This should not result in a crash.
   int new_default = controller_->MakeDefaultTemplateURL(0);
   EXPECT_EQ(0, new_default);
 }
 
 // Mutates the TemplateURLService and make sure table model is updating
 // appropriately.
 TEST_F(KeywordEditorControllerTest, MutateTemplateURLService) {
-  TemplateURL* turl = new TemplateURL();
-  turl->set_keyword(ASCIIToUTF16("a"));
-  turl->set_short_name(ASCIIToUTF16("b"));
+  TemplateURLData data;
+  data.short_name = ASCIIToUTF16("b");
+  data.SetKeyword(ASCIIToUTF16("a"));
+  TemplateURL* turl = new TemplateURL(data);
   model_->Add(turl);
 
   // Table model should have updated.
   VerifyChangeCount(1, 0, 0, 0);
 
   // And should contain the newly added TemplateURL.
   ASSERT_EQ(1, table_model()->RowCount());
   ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl));
 }