1 files changed, 11 insertions, 11 deletions

diff --git a/chrome/test/automation/autocomplete_edit_proxy.h b/chrome/test/automation/autocomplete_edit_proxy.h
index e33824a..73dc673 100644
--- a/chrome/test/automation/autocomplete_edit_proxy.h
+++ b/chrome/test/automation/autocomplete_edit_proxy.h
@@ -48,11 +48,11 @@ struct AutocompleteMatchData {
   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;
@@ -68,11 +68,11 @@ struct ParamTraits<AutocompleteMatchData> {
     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);
@@ -83,11 +83,11 @@ struct ParamTraits<AutocompleteMatchData> {
     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))
@@ -136,10 +136,10 @@ class AutocompleteEditProxy : public AutomationResourceProxy {
   // 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