Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/ui/cocoa/keyword_editor_cocoa_controller_unittest.mm

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/mac/scoped_nsautorelease_pool.h"
 #include "base/scoped_nsobject.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 @interface FakeKeywordEditorController : KeywordEditorCocoaController {
@@ skipping 126 matching lines @@
   [newSharedInstance close];
 }
 
 TEST_F(KeywordEditorCocoaControllerTest, IndexInModelForRowMixed) {
   [controller_ window];  // Force |-awakeFromNib|.
   TemplateURLModel* template_model = [controller_ controller]->url_model();
 
   // Add a default engine.
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL("http://test1/{searchTerms}", 0, 0);
-  t_url->set_keyword(ASCIIToUTF16("test1"));
-  t_url->set_short_name(ASCIIToUTF16("Test1"));
+  t_url->set_keyword(L"test1");
+  t_url->set_short_name(L"Test1");
   t_url->set_show_in_default_list(true);
   template_model->Add(t_url);
 
   // Add a non-default engine.
   t_url = new TemplateURL();
   t_url->SetURL("http://test2/{searchTerms}", 0, 0);
-  t_url->set_keyword(ASCIIToUTF16("test2"));
-  t_url->set_short_name(ASCIIToUTF16("Test2"));
+  t_url->set_keyword(L"test2");
+  t_url->set_short_name(L"Test2");
   t_url->set_show_in_default_list(false);
   template_model->Add(t_url);
 
   // Two headers with a single row underneath each.
   NSTableView* table = [controller_ tableView];
   [table reloadData];
   ASSERT_EQ(4, [[controller_ tableView] numberOfRows]);
 
   // Index 0 is the group header, index 1 should be the first engine.
   ASSERT_EQ(0, [controller_ indexInModelForRow:1]);
@@ skipping 13 matching lines @@
   ASSERT_TRUE([controller_ tableView:table shouldSelectRow:3]);
 }
 
 TEST_F(KeywordEditorCocoaControllerTest, IndexInModelForDefault) {
   [controller_ window];  // Force |-awakeFromNib|.
   TemplateURLModel* template_model = [controller_ controller]->url_model();
 
   // Add 2 default engines.
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL("http://test1/{searchTerms}", 0, 0);
-  t_url->set_keyword(ASCIIToUTF16("test1"));
-  t_url->set_short_name(ASCIIToUTF16("Test1"));
+  t_url->set_keyword(L"test1");
+  t_url->set_short_name(L"Test1");
   t_url->set_show_in_default_list(true);
   template_model->Add(t_url);
 
   t_url = new TemplateURL();
   t_url->SetURL("http://test2/{searchTerms}", 0, 0);
-  t_url->set_keyword(ASCIIToUTF16("test2"));
-  t_url->set_short_name(ASCIIToUTF16("Test2"));
+  t_url->set_keyword(L"test2");
+  t_url->set_short_name(L"Test2");
   t_url->set_show_in_default_list(true);
   template_model->Add(t_url);
 
   // One header and two rows.
   NSTableView* table = [controller_ tableView];
   [table reloadData];
   ASSERT_EQ(3, [[controller_ tableView] numberOfRows]);
 
   // Index 0 is the group header, index 1 should be the first engine.
   ASSERT_EQ(0, [controller_ indexInModelForRow:1]);
   ASSERT_EQ(1, [controller_ indexInModelForRow:2]);
 
   ASSERT_TRUE([controller_ tableView:table isGroupRow:0]);
   ASSERT_FALSE([controller_ tableView:table isGroupRow:1]);
   ASSERT_FALSE([controller_ tableView:table isGroupRow:2]);
 
   ASSERT_FALSE([controller_ tableView:table shouldSelectRow:0]);
   ASSERT_TRUE([controller_ tableView:table shouldSelectRow:1]);
   ASSERT_TRUE([controller_ tableView:table shouldSelectRow:2]);
 }
 
 }  // namespace