Revert 72380 - Remove wstring from autocomplete....

chrome/test/automation/automation_proxy_uitest.cc

Index: chrome/test/automation/automation_proxy_uitest.cc
===================================================================
--- chrome/test/automation/automation_proxy_uitest.cc	(revision 72383)
+++ chrome/test/automation/automation_proxy_uitest.cc	(working copy)
@@ -1384,8 +1384,8 @@
       browser->GetAutocompleteEdit());
   ASSERT_TRUE(edit.get());
   EXPECT_TRUE(edit->is_valid());
-  const string16 text_to_set = ASCIIToUTF16("Lollerskates");
-  string16 actual_text;
+  const std::wstring text_to_set = L"Lollerskates";
+  std::wstring actual_text;
   EXPECT_TRUE(edit->SetText(text_to_set));
   EXPECT_TRUE(edit->GetText(&actual_text));
   EXPECT_EQ(text_to_set, actual_text);
@@ -1409,9 +1409,9 @@
   ASSERT_TRUE(edit2.get());
   EXPECT_TRUE(browser2->GetTab(0)->WaitForTabToBeRestored(
       TestTimeouts::action_max_timeout_ms()));
-  const string16 text_to_set1 = ASCIIToUTF16("Lollerskates");
-  const string16 text_to_set2 = ASCIIToUTF16("Roflcopter");
-  string16 actual_text1, actual_text2;
+  const std::wstring text_to_set1 = L"Lollerskates";
+  const std::wstring text_to_set2 = L"Roflcopter";
+  std::wstring actual_text1, actual_text2;
   EXPECT_TRUE(edit1->SetText(text_to_set1));
   EXPECT_TRUE(edit2->SetText(text_to_set2));
   EXPECT_TRUE(edit1->GetText(&actual_text1));
@@ -1438,7 +1438,7 @@
   EXPECT_TRUE(edit->is_valid());
   EXPECT_TRUE(browser->ApplyAccelerator(IDC_FOCUS_LOCATION));
   ASSERT_TRUE(edit->WaitForFocus());
-  EXPECT_TRUE(edit->SetText(ASCIIToUTF16("Roflcopter")));
+  EXPECT_TRUE(edit->SetText(L"Roflcopter"));
   EXPECT_TRUE(edit->WaitForQuery(TestTimeouts::action_max_timeout_ms()));
   bool query_in_progress;
   EXPECT_TRUE(edit->IsQueryInProgress(&query_in_progress));
@@ -1513,8 +1513,7 @@
   EXPECT_FALSE(modal_dialog_showing);
   int result = -1;
   EXPECT_TRUE(tab->ExecuteAndExtractInt(
-      std::wstring(),
-      L"window.domAutomationController.send(result);", &result));
+      L"", L"window.domAutomationController.send(result);", &result));
   EXPECT_EQ(0, result);
 
   // Try again.
@@ -1534,8 +1533,7 @@
                                                      &button));
   EXPECT_FALSE(modal_dialog_showing);
   EXPECT_TRUE(tab->ExecuteAndExtractInt(
-      std::wstring(),
-      L"window.domAutomationController.send(result);", &result));
+      L"", L"window.domAutomationController.send(result);", &result));
   EXPECT_EQ(1, result);
 }
 
Property changes on: chrome/test/automation/automation_proxy_uitest.cc
___________________________________________________________________
Added: svn:mergeinfo