Omnibox - Strip Extra Whitespace from Custom Search Engine Names

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/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory_test_util.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
@@ skipping 224 matching lines @@
   int new_default = controller()->MakeDefaultTemplateURL(index);
   EXPECT_EQ(index, new_default);
 }
 
 // Mutates the TemplateURLService and make sure table model is updating
 // appropriately.
 TEST_F(KeywordEditorControllerTest, MutateTemplateURLService) {
   int original_row_count = table_model()->RowCount();
 
   TemplateURLData data;
-  data.short_name = ASCIIToUTF16("b");
+  data.SetShortName(ASCIIToUTF16("b"));
   data.SetKeyword(ASCIIToUTF16("a"));
   TemplateURL* turl = new TemplateURL(data);
   util()->model()->Add(turl);
 
   // Table model should have updated.
   VerifyChangeCount(1, 0, 0, 0);
 
   // And should contain the newly added TemplateURL.
   ASSERT_EQ(original_row_count + 1, table_model()->RowCount());
   ASSERT_GE(table_model()->IndexOfTemplateURL(turl), 0);
 }