Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/sync/test/integration/search_engines_helper.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/sync/test/integration/search_engines_helper.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 177 matching lines @@
   return CreateTestTemplateURL(profile, seed, keyword,
       base::StringPrintf("http://www.test%d.com/", seed), sync_guid);
 }
 
 TemplateURL* CreateTestTemplateURL(Profile* profile,
                                    int seed,
                                    const base::string16& keyword,
                                    const std::string& url,
                                    const std::string& sync_guid) {
   TemplateURLData data;
-  data.short_name = CreateKeyword(seed);
+  data.SetShortName(CreateKeyword(seed));
   data.SetKeyword(keyword);
   data.SetURL(url);
   data.favicon_url = GURL("http://favicon.url");
   data.safe_for_autoreplace = true;
   data.date_created = base::Time::FromTimeT(100);
   data.last_modified = base::Time::FromTimeT(100);
   data.prepopulate_id = 999999;
   data.sync_guid = sync_guid;
   return new TemplateURL(data);
 }
@@ skipping 50 matching lines @@
   service->SetUserSelectedDefaultSearchProvider(turl);
   if (test()->use_verifier()) {
     TemplateURL* verifier_turl =
         GetVerifierService()->GetTemplateURLForKeyword(CreateKeyword(seed));
     ASSERT_TRUE(verifier_turl);
     GetVerifierService()->SetUserSelectedDefaultSearchProvider(verifier_turl);
   }
 }
 
 }  // namespace search_engines_helper