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

chrome/browser/search_engines/search_provider_install_data_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/search_engines/search_provider_install_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_model_test_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Create a TemplateURL. The caller owns the returned TemplateURL*.
 static TemplateURL* CreateTemplateURL(const std::string& url,
-                                      const std::string& keyword) {
+                                      const std::wstring& keyword) {
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL(url, 0, 0);
-  t_url->set_keyword(UTF8ToUTF16(keyword));
-  t_url->set_short_name(UTF8ToUTF16(keyword));
+  t_url->set_keyword(keyword);
+  t_url->set_short_name(keyword);
   return t_url;
 }
 
 // Test the SearchProviderInstallData::GetInstallState.
 class TestGetInstallState :
     public base::RefCountedThreadSafe<TestGetInstallState> {
  public:
   explicit TestGetInstallState(SearchProviderInstallData* install_data)
       : install_data_(install_data),
         main_loop_(NULL),
@@ skipping 177 matching lines @@
   SearchProviderInstallData* install_data_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProviderInstallDataTest);
 };
 
 TEST_F(SearchProviderInstallDataTest, GetInstallState) {
   // Set up the database.
   util_.ChangeModelToLoadState();
   std::string host = "www.unittest.com";
   TemplateURL* t_url = CreateTemplateURL("http://" + host + "/path",
-                                         "unittest");
+                                         L"unittest");
   util_.model()->Add(t_url);
 
   // Wait for the changes to be saved.
   TemplateURLModelTestUtil::BlockTillServiceProcessesRequests();
 
   // Verify the search providers install state (with no default set).
   scoped_refptr<TestGetInstallState> test_get_install_state(
       new TestGetInstallState(install_data_));
   test_get_install_state->set_search_provider_host(host);
   EXPECT_TRUE(test_get_install_state->RunTests());
 
   // Set-up a default and try it all one more time.
   std::string default_host = "www.mmm.com";
   TemplateURL* default_url = CreateTemplateURL("http://" + default_host + "/",
-                                               "mmm");
+                                               L"mmm");
   util_.model()->Add(default_url);
   util_.model()->SetDefaultSearchProvider(default_url);
   test_get_install_state->set_default_search_provider_host(default_host);
   EXPECT_TRUE(test_get_install_state->RunTests());
 }
 
 
 TEST_F(SearchProviderInstallDataTest, ManagedDefaultSearch) {
   // Set up the database.
   util_.ChangeModelToLoadState();
   std::string host = "www.unittest.com";
   TemplateURL* t_url = CreateTemplateURL("http://" + host + "/path",
-                                         "unittest");
+                                         L"unittest");
   util_.model()->Add(t_url);
 
   // Set a managed preference that establishes a default search provider.
   std::string host2 = "www.managedtest.com";
   std::string url2 = "http://" + host2 + "/p{searchTerms}";
   SimulateDefaultSearchIsManaged(url2);
   EXPECT_TRUE(util_.model()->is_default_search_managed());
 
   // Wait for the changes to be saved.
   util_.BlockTillServiceProcessesRequests();
@@ skipping 13 matching lines @@
       new TestGetInstallState(install_data_));
 
   // Set up the database.
   util_.ChangeModelToLoadState();
   std::string google_host = "w.com";
   util_.SetGoogleBaseURL("http://" + google_host + "/");
   // Wait for the I/O thread to process the update notification.
   TemplateURLModelTestUtil::BlockTillIOThreadProcessesRequests();
 
   TemplateURL* t_url = CreateTemplateURL("{google:baseURL}?q={searchTerms}",
-                                         "t");
+                                         L"t");
   util_.model()->Add(t_url);
   TemplateURL* default_url = CreateTemplateURL("http://d.com/",
-                                               "d");
+                                               L"d");
   util_.model()->Add(default_url);
   util_.model()->SetDefaultSearchProvider(default_url);
 
   // Wait for the changes to be saved.
   TemplateURLModelTestUtil::BlockTillServiceProcessesRequests();
 
   // Verify the search providers install state (with no default set).
   test_get_install_state->set_search_provider_host(google_host);
   EXPECT_TRUE(test_get_install_state->RunTests());
 
   // Change the Google base url.
   google_host = "foo.com";
   util_.SetGoogleBaseURL("http://" + google_host + "/");
   // Wait for the I/O thread to process the update notification.
   TemplateURLModelTestUtil::BlockTillIOThreadProcessesRequests();
 
   // Verify that the change got picked up.
   test_get_install_state->set_search_provider_host(google_host);
   EXPECT_TRUE(test_get_install_state->RunTests());
 }