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

chrome/browser/instant/instant_browsertest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/instant/instant_controller.h"
@@ skipping 39 matching lines @@
     // TemplateURLModel takes ownership of this.
     TemplateURL* template_url = new TemplateURL();
 
     std::string url = StringPrintf(
         "http://%s:%d/files/instant/%s?q={searchTerms}",
         test_server()->host_port_pair().host().c_str(),
         test_server()->host_port_pair().port(),
         page.c_str());
     template_url->SetURL(url, 0, 0);
     template_url->SetInstantURL(url, 0, 0);
-    template_url->set_keyword(ASCIIToUTF16("foo"));
-    template_url->set_short_name(ASCIIToUTF16("foo"));
+    template_url->set_keyword(UTF8ToWide("foo"));
+    template_url->set_short_name(UTF8ToWide("foo"));
 
     model->Add(template_url);
     model->SetDefaultSearchProvider(template_url);
   }
 
   void FindLocationBar() {
     if (location_bar_)
       return;
     location_bar_ = browser()->window()->GetLocationBar();
     ASSERT_TRUE(location_bar_);
@@ skipping 574 matching lines @@
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 2 2 a false abcdef true",
       GetSearchStateAsString(preview_));
 }