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

chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
@@ skipping 188 matching lines @@
 
   // Once the URL is entered, we should have all 3 valid fields.
   [[controller_ urlField] setStringValue:@"http://foo-bar.com"];
   EXPECT_TRUE([controller_ validateFields]);
   EXPECT_EQ([controller_ goodImage], [[controller_ urlImage] image]);
   EXPECT_TRUE([[controller_ doneButton] isEnabled]);
 }
 
 // Tests editing an existing TemplateURL.
 TEST_F(EditSearchEngineControllerTest, EditTemplateURL) {
-  TemplateURL url;
-  url.set_short_name(ASCIIToUTF16("Foobar"));
-  url.set_keyword(ASCIIToUTF16("keyword"));
+  TemplateURLData data;
+  data.short_name = ASCIIToUTF16("Foobar");
+  data.SetKeyword(ASCIIToUTF16("keyword"));
   std::string urlString = TemplateURLRef::DisplayURLToURLRef(
       ASCIIToUTF16("http://foo-bar.com"));
-  url.SetURL(urlString);
+  data.SetURL(urlString);
+  TemplateURL url(data);
   FakeEditSearchEngineController *controller =
       [[FakeEditSearchEngineController alloc] initWithProfile:profile()
                                                      delegate:nil
                                                   templateURL:&url];
   EXPECT_TRUE([controller window]);
   NSString* title = l10n_util::GetNSString(
       IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE);
   EXPECT_NSEQ(title, [[controller window] title]);
   NSString* nameString = [[controller nameField] stringValue];
   EXPECT_NSEQ(@"Foobar", nameString);
   NSString* keywordString = [[controller keywordField] stringValue];
   EXPECT_NSEQ(@"keyword", keywordString);
   NSString* urlValueString = [[controller urlField] stringValue];
   EXPECT_NSEQ(@"http://foo-bar.com", urlValueString);
   EXPECT_TRUE([controller validateFields]);
   [controller close];
 }
 
 }  // namespace