Remove wstring from autocomplete....

chrome/test/automation/autocomplete_edit_proxy.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H_
 #define CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
         contents(match.contents),
         description(match.description),
         is_history_what_you_typed_match(match.is_history_what_you_typed_match),
         type(AutocompleteMatch::TypeToString(match.type)),
         starred(match.starred) {
   }
 
   std::string provider_name;
   int relevance;
   bool deletable;
-  std::wstring fill_into_edit;
+  string16 fill_into_edit;
   size_t inline_autocomplete_offset;
   GURL destination_url;
-  std::wstring contents;
-  std::wstring description;
+  string16 contents;
+  string16 description;
   bool is_history_what_you_typed_match;
   std::string type;
   bool starred;
 };
 typedef std::vector<AutocompleteMatchData> Matches;
 
 namespace IPC {
 
 template <>
 struct ParamTraits<AutocompleteMatchData> {
   typedef AutocompleteMatchData param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteString(p.provider_name);
     m->WriteInt(p.relevance);
     m->WriteBool(p.deletable);
-    m->WriteWString(p.fill_into_edit);
+    m->WriteString16(p.fill_into_edit);
     m->WriteSize(p.inline_autocomplete_offset);
     m->WriteString(p.destination_url.possibly_invalid_spec());
-    m->WriteWString(p.contents);
-    m->WriteWString(p.description);
+    m->WriteString16(p.contents);
+    m->WriteString16(p.description);
     m->WriteBool(p.is_history_what_you_typed_match);
     m->WriteString(p.type);
     m->WriteBool(p.starred);
   }
 
   static bool Read(const Message* m, void** iter, param_type* r) {
     std::string destination_url;
     if (!m->ReadString(iter, &r->provider_name) ||
         !m->ReadInt(iter, &r->relevance) ||
         !m->ReadBool(iter, &r->deletable) ||
-        !m->ReadWString(iter, &r->fill_into_edit) ||
+        !m->ReadString16(iter, &r->fill_into_edit) ||
         !m->ReadSize(iter, &r->inline_autocomplete_offset) ||
         !m->ReadString(iter, &destination_url) ||
-        !m->ReadWString(iter, &r->contents) ||
-        !m->ReadWString(iter, &r->description) ||
+        !m->ReadString16(iter, &r->contents) ||
+        !m->ReadString16(iter, &r->description) ||
         !m->ReadBool(iter, &r->is_history_what_you_typed_match) ||
         !m->ReadString(iter, &r->type) ||
         !m->ReadBool(iter, &r->starred))
       return false;
     r->destination_url = GURL(destination_url);
     return true;
   }
 
   static void Log(const param_type& p, std::string* l) {
     l->append("[");
@@ skipping 28 matching lines @@
   AutocompleteEditProxy(AutomationMessageSender* sender,
                         AutomationHandleTracker* tracker,
                         int handle)
       : AutomationResourceProxy(tracker, sender, handle) {}
   virtual ~AutocompleteEditProxy() {}
 
   // All these functions return true if the autocomplete edit is valid and
   // there are no IPC errors.
 
   // Gets the text visible in the omnibox.
-  bool GetText(std::wstring* text) const;
+  bool GetText(string16* text) const;
 
   // Sets the text visible in the omnibox.
-  bool SetText(const std::wstring& text);
+  bool SetText(const string16& text);
 
   // Determines if a query to an autocomplete provider is still in progress.
   // NOTE: No autocomplete queries will be made if the omnibox doesn't have
   // focus.  This can be achieved by sending a IDC_FOCUS_LOCATION accelerator
   // to the browser.
   bool IsQueryInProgress(bool* query_in_progress) const;
 
   // Gets a list of autocomplete matches that have been gathered so far.
   bool GetAutocompleteMatches(Matches* matches) const;
 
   // Waits for the autocomplete edit to receive focus.
   bool WaitForFocus() const;
 
   // Waits for all queries to autocomplete providers to complete.
   // |wait_timeout_ms| gives the number of milliseconds to wait for the query
   // to finish. Returns false if IPC call failed or if the function times out.
   bool WaitForQuery(int wait_timeout_ms) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H_