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

chrome/browser/automation/testing_automation_provider.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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
@@ skipping 2668 matching lines @@
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   TemplateURLModel* url_model(profile_->GetTemplateURLModel());
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   ListValue* search_engines = new ListValue;
   std::vector<const TemplateURL*> template_urls = url_model->GetTemplateURLs();
   for (std::vector<const TemplateURL*>::const_iterator it =
        template_urls.begin(); it != template_urls.end(); ++it) {
     DictionaryValue* search_engine = new DictionaryValue;
-    search_engine->SetString("short_name", UTF16ToUTF8((*it)->short_name()));
-    search_engine->SetString("description", UTF16ToUTF8((*it)->description()));
-    search_engine->SetString("keyword", UTF16ToUTF8((*it)->keyword()));
+    search_engine->SetString("short_name", WideToUTF8((*it)->short_name()));
+    search_engine->SetString("description", WideToUTF8((*it)->description()));
+    search_engine->SetString("keyword", WideToUTF8((*it)->keyword()));
     search_engine->SetBoolean("in_default_list", (*it)->ShowInDefaultList());
     search_engine->SetBoolean("is_default",
         (*it) == url_model->GetDefaultSearchProvider());
     search_engine->SetBoolean("is_valid", (*it)->url()->IsValid());
     search_engine->SetBoolean("supports_replacement",
                               (*it)->url()->SupportsReplacement());
     search_engine->SetString("url", (*it)->url()->url());
     search_engine->SetString("host", (*it)->url()->GetHost());
     search_engine->SetString("path", (*it)->url()->GetPath());
     search_engine->SetString("display_url",
-                             UTF16ToUTF8((*it)->url()->DisplayURL()));
+                             WideToUTF8((*it)->url()->DisplayURL()));
     search_engines->Append(search_engine);
   }
   return_value->Set("search_engines", search_engines);
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 // Refer to pyauto.py for sample JSON input.
 void TestingAutomationProvider::AddOrEditSearchEngine(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   TemplateURLModel* url_model(profile_->GetTemplateURLModel());
   const TemplateURL* template_url;
   string16 new_title;
   string16 new_keyword;
   std::string new_url;
   std::string keyword;
   if (!args->GetString("new_title", &new_title) ||
       !args->GetString("new_keyword", &new_keyword) ||
       !args->GetString("new_url", &new_url)) {
     AutomationJSONReply(this, reply_message).SendError(
         "One or more inputs invalid");
     return;
   }
   std::string new_ref_url = TemplateURLRef::DisplayURLToURLRef(
-      UTF8ToUTF16(new_url));
+      UTF8ToWide(new_url));
   scoped_ptr<KeywordEditorController> controller(
       new KeywordEditorController(profile_));
   if (args->GetString("keyword", &keyword)) {
-    template_url = url_model->GetTemplateURLForKeyword(UTF8ToUTF16(keyword));
+    template_url = url_model->GetTemplateURLForKeyword(UTF8ToWide(keyword));
     if (template_url == NULL) {
       AutomationJSONReply(this, reply_message).SendError(
           StringPrintf("No match for keyword: %s", keyword.c_str()));
       return;
     }
     url_model->AddObserver(new AutomationProviderSearchEngineObserver(
         this, reply_message));
     controller->ModifyTemplateURL(template_url, new_title, new_keyword,
                                   new_ref_url);
   } else {
@@ skipping 12 matching lines @@
   TemplateURLModel* url_model(profile_->GetTemplateURLModel());
   std::string keyword;
   std::string action;
   if (!args->GetString("keyword", &keyword) ||
       !args->GetString("action", &action)) {
     AutomationJSONReply(this, reply_message).SendError(
         "One or more inputs invalid");
     return;
   }
   const TemplateURL* template_url(
-      url_model->GetTemplateURLForKeyword(UTF8ToUTF16(keyword)));
+      url_model->GetTemplateURLForKeyword(UTF8ToWide(keyword)));
   if (template_url == NULL) {
     AutomationJSONReply(this, reply_message).SendError(
         StringPrintf("No match for keyword: %s", keyword.c_str()));
     return;
   }
   if (action == "delete") {
     url_model->AddObserver(new AutomationProviderSearchEngineObserver(
       this, reply_message));
     url_model->Remove(template_url);
   } else if (action == "default") {
@@ skipping 1740 matching lines @@
     // If you change this, update Observer for NotificationType::SESSION_END
     // below.
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &TestingAutomationProvider::OnRemoveProvider));
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }