Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 459 matching lines @@
     static const char kImageSearchPostParams[] =
         "thumb={google:imageThumbnail}";
 
     TemplateURLService* model =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     ASSERT_TRUE(model);
     ui_test_utils::WaitForTemplateURLServiceToLoad(model);
     ASSERT_TRUE(model->loaded());
 
     TemplateURLData data;
-    data.short_name = base::ASCIIToUTF16(kShortName);
-    data.SetKeyword(data.short_name);
+    data.SetShortName(base::ASCIIToUTF16(kShortName));
+    data.SetKeyword(data.short_name());
     data.SetURL(test_server()->GetURL(kSearchURL).spec());
     data.image_url = GetImageSearchURL().spec();
     data.image_url_post_params = kImageSearchPostParams;
 
     // The model takes ownership of |template_url|.
     TemplateURL* template_url = new TemplateURL(data);
     ASSERT_TRUE(model->Add(template_url));
     model->SetUserSelectedDefaultSearchProvider(template_url);
   }
 
@@ skipping 27 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   ThumbnailResponseWatcher watcher(tab->GetRenderProcessHost());
   AttemptImageSearch();
 
   // The browser should receive a response from the renderer, because the
   // renderer should not crash.
   EXPECT_EQ(ThumbnailResponseWatcher::THUMBNAIL_RECEIVED, watcher.Wait());
 }
 
 }  // namespace