Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}

chrome/browser/autofill/autofill_browsertest.cc

 // Copyright (c) 2012 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/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 200 matching lines @@
 
     std::string js;
     for (FormMap::const_iterator i = data.begin(); i != data.end(); ++i) {
       js += "document.getElementById('" + i->first + "').value = '" +
             i->second + "';";
     }
     js += "document.getElementById('testform').submit();";
 
     WindowedPersonalDataManagerObserver observer(browser());
     ASSERT_TRUE(
-        content::ExecuteJavaScript(render_view_host(), L"", ASCIIToWide(js)));
+        content::ExecuteJavaScript(render_view_host(), "", js));
     observer.Wait();
   }
 
   void SubmitCreditCard(const char* name,
                         const char* number,
                         const char* exp_month,
                         const char* exp_year) {
     FormMap data;
     data["CREDIT_CARD_NAME"] = name;
     data["CREDIT_CARD_NUMBER"] = number;
     data["CREDIT_CARD_EXP_MONTH"] = exp_month;
     data["CREDIT_CARD_EXP_4_DIGIT_YEAR"] = exp_year;
     FillFormAndSubmit("autofill_creditcard_form.html", data);
   }
 
   // Populates a webpage form using autofill data and keypress events.
   // This function focuses the specified input field in the form, and then
   // sends keypress events to the tab to cause the form to be populated.
   void PopulateForm(const std::string& field_id) {
     std::string js("document.getElementById('" + field_id + "').focus();");
     ASSERT_TRUE(
-        content::ExecuteJavaScript(render_view_host(), L"", ASCIIToWide(js)));
+        content::ExecuteJavaScript(render_view_host(), "", js));
 
     SendKeyAndWait(ui::VKEY_DOWN,
                    chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
     SendKeyAndWait(ui::VKEY_DOWN,
                    chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
     SendKeyAndWait(ui::VKEY_RETURN,
                    chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
   }
 
   // Aggregate profiles from forms into Autofill preferences. Returns the number
@@ skipping 28 matching lines @@
       data["ADDRESS_HOME_STATE"] = fields[8];
       data["ADDRESS_HOME_ZIP"] = fields[9];
       data["ADDRESS_HOME_COUNTRY"] = fields[10];
       data["PHONE_HOME_WHOLE_NUMBER"] = fields[11];
 
       FillFormAndSubmit("duplicate_profiles_test.html", data);
     }
     return lines.size();
   }
 
-  void ExpectFieldValue(const std::wstring& field_name,
+  void ExpectFieldValue(const std::string& field_name,
                         const std::string& expected_value) {
     std::string value;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
-        L"window.domAutomationController.send("
-        L"document.getElementById('" + field_name + L"').value);", &value));
+        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+        "",
+        "window.domAutomationController.send("
+        "    document.getElementById('" + field_name + "').value);",
+        &value));
     EXPECT_EQ(expected_value, value);
   }
 
   RenderViewHost* render_view_host() {
     return chrome::GetActiveWebContents(browser())->GetRenderViewHost();
   }
 
   void SimulateURLFetch(bool success) {
     net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
     ASSERT_TRUE(fetcher);
@@ skipping 35 matching lines @@
   }
 
   void FocusFirstNameField() {
     LOG(WARNING) << "Clicking on the tab.";
     content::SimulateMouseClick(chrome::GetActiveWebContents(browser()), 0,
         WebKit::WebMouseEvent::ButtonLeft);
 
     LOG(WARNING) << "Focusing the first name field.";
     bool result = false;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        render_view_host(), L"",
-        L"if (document.readyState === 'complete')"
-        L"  document.getElementById('firstname').focus();"
-        L"else"
-        L"  domAutomationController.send(false);",
+        render_view_host(),
+        "",
+        "if (document.readyState === 'complete')"
+        "  document.getElementById('firstname').focus();"
+        "else"
+        "  domAutomationController.send(false);",
         &result));
     ASSERT_TRUE(result);
   }
 
   void ExpectFilledTestForm() {
-    ExpectFieldValue(L"firstname", "Milton");
-    ExpectFieldValue(L"lastname", "Waddams");
-    ExpectFieldValue(L"address1", "4120 Freidrich Lane");
-    ExpectFieldValue(L"address2", "Basement");
-    ExpectFieldValue(L"city", "Austin");
-    ExpectFieldValue(L"state", "TX");
-    ExpectFieldValue(L"zip", "78744");
-    ExpectFieldValue(L"country", "US");
-    ExpectFieldValue(L"phone", "5125551234");
+    ExpectFieldValue("firstname", "Milton");
+    ExpectFieldValue("lastname", "Waddams");
+    ExpectFieldValue("address1", "4120 Freidrich Lane");
+    ExpectFieldValue("address2", "Basement");
+    ExpectFieldValue("city", "Austin");
+    ExpectFieldValue("state", "TX");
+    ExpectFieldValue("zip", "78744");
+    ExpectFieldValue("country", "US");
+    ExpectFieldValue("phone", "5125551234");
   }
 
   void SendKeyAndWait(ui::KeyboardCode key, int notification_type) {
     content::WindowedNotificationObserver observer(
         notification_type, content::Source<RenderViewHost>(render_view_host()));
     content::SimulateKeyPress(chrome::GetActiveWebContents(browser()),
                               key, false, false, false, false);
     observer.Wait();
   }
 
   void TryBasicFormFill() {
     FocusFirstNameField();
 
     // Start filling the first name field with "M" and wait for the popup to be
     // shown.
     LOG(WARNING) << "Typing 'M' to bring up the Autofill popup.";
     SendKeyAndWait(
         ui::VKEY_M, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
     // Press the down arrow to select the suggestion and preview the autofilled
     // form.
     LOG(WARNING) << "Simulating down arrow press to initiate Autofill preview.";
     SendKeyAndWait(
         ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
     // The previewed values should not be accessible to JavaScript.
-    ExpectFieldValue(L"firstname", "M");
-    ExpectFieldValue(L"lastname", "");
-    ExpectFieldValue(L"address1", "");
-    ExpectFieldValue(L"address2", "");
-    ExpectFieldValue(L"city", "");
-    ExpectFieldValue(L"state", "");
-    ExpectFieldValue(L"zip", "");
-    ExpectFieldValue(L"country", "");
-    ExpectFieldValue(L"phone", "");
+    ExpectFieldValue("firstname", "M");
+    ExpectFieldValue("lastname", "");
+    ExpectFieldValue("address1", "");
+    ExpectFieldValue("address2", "");
+    ExpectFieldValue("city", "");
+    ExpectFieldValue("state", "");
+    ExpectFieldValue("zip", "");
+    ExpectFieldValue("country", "");
+    ExpectFieldValue("phone", "");
     // TODO(isherman): It would be nice to test that the previewed values are
     // displayed: http://crbug.com/57220
 
     // Press Enter to accept the autofill suggestions.
     LOG(WARNING) << "Simulating Return press to fill the form.";
     SendKeyAndWait(
         ui::VKEY_RETURN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
     // The form should be filled.
     ExpectFilledTestForm();
@@ skipping 112 matching lines @@
   ExpectFilledTestForm();
 
   // The change event should have already fired for unfocused fields, both of
   // <input> and of <select> type. However, it should not yet have fired for the
   // focused field.
   bool focused_fired = false;
   bool unfocused_fired = false;
   bool changed_select_fired = false;
   bool unchanged_select_fired = false;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      render_view_host(), L"",
-      L"domAutomationController.send(focused_fired);", &focused_fired));
+      render_view_host(),
+      "",
+      "domAutomationController.send(focused_fired);",
+      &focused_fired));
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      render_view_host(), L"",
-      L"domAutomationController.send(unfocused_fired);", &unfocused_fired));
+      render_view_host(),
+      "",
+      "domAutomationController.send(unfocused_fired);",
+      &unfocused_fired));
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      render_view_host(), L"",
-      L"domAutomationController.send(changed_select_fired);",
+      render_view_host(),
+      "",
+      "domAutomationController.send(changed_select_fired);",
       &changed_select_fired));
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      render_view_host(), L"",
-      L"domAutomationController.send(unchanged_select_fired);",
+      render_view_host(),
+      "",
+      "domAutomationController.send(unchanged_select_fired);",
       &unchanged_select_fired));
   EXPECT_FALSE(focused_fired);
   EXPECT_TRUE(unfocused_fired);
   EXPECT_TRUE(changed_select_fired);
   EXPECT_FALSE(unchanged_select_fired);
 
   // Unfocus the first name field. Its change event should fire.
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      render_view_host(), L"",
-      L"document.getElementById('firstname').blur();"
-      L"domAutomationController.send(focused_fired);", &focused_fired));
+      render_view_host(),
+      "",
+      "document.getElementById('firstname').blur();"
+      "domAutomationController.send(focused_fired);", &focused_fired));
   EXPECT_TRUE(focused_fired);
 }
 
 // Test that we can autofill forms distinguished only by their |id| attribute.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillFormsDistinguishedById) {
   CreateTestProfile();
 
   // Load the test page.
   const std::string kURL =
@@ skipping 52 matching lines @@
            " <option value=\"\" selected=\"yes\">--</option>"
            " <option value=\"CA\">Canada</option>"
            " <option value=\"US\">United States</option>"
            " </select><br>"
            "<label for=\"phone\">Phone number:</label>"
            " <input type=\"text\" id=\"phone\"><br>"
            "</form>")));
 
   // Invoke Autofill.
   TryBasicFormFill();
-  ExpectFieldValue(L"state_freeform", "");
+  ExpectFieldValue("state_freeform", "");
 }
 
 // http://crbug.com/150084
 #if defined(OS_MAC)
 #define MAYBE_AutofillFormWithNonAutofillableField \
     AutofillFormWithNonAutofillableField
 #else
 #define MAYBE_AutofillFormWithNonAutofillableField \
     DISABLED_AutofillFormWithNonAutofillableField
 #endif
@@ skipping 117 matching lines @@
            ""
            "  for (var i = 0; i < elements.length; i++) {"
            "    var name = elements[i][0];"
            "    var label = elements[i][1];"
            "    AddElement(name, label);"
            "  }"
            "};"
            "</script>")));
 
   // Dynamically construct the form.
-  ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), L"",
-                                         L"BuildForm();"));
+  ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), "",
+                                         "BuildForm();"));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that form filling works after reloading the current page.
 // This test brought to you by http://crbug.com/69204
 #if defined(OS_MACOSX)
 // Now flaky on everything but mac.
 // http://crbug.com/150084
@@ skipping 78 matching lines @@
   SimulateURLFetch(true);
 
   content::WindowedNotificationObserver translation_observer(
       chrome::NOTIFICATION_PAGE_TRANSLATED,
       content::NotificationService::AllSources());
 
   // Simulate translation to kick onTranslateElementLoad.
   // But right now, the call stucks here.
   // Once click the text field, it starts again.
   ASSERT_TRUE(content::ExecuteJavaScript(
-      render_view_host(), L"",
-      L"cr.googleTranslate.onTranslateElementLoad();"));
+      render_view_host(),
+      "",
+      "cr.googleTranslate.onTranslateElementLoad();"));
 
   // Simulate the render notifying the translation has been done.
   translation_observer.Wait();
 
   TryBasicFormFill();
 }
 
 // Test filling profiles with unicode strings and crazy characters.
 // TODO(isherman): rewrite as unit test under PersonalDataManagerTest.
 IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
@@ skipping 290 matching lines @@
   profile.SetRawInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
   profile.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("1-408-555-4567"));
   SetProfile(profile);
 
   GURL url = test_server()->GetURL("files/autofill/form_phones.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
-  ExpectFieldValue(L"NAME_FIRST", "Bob");
-  ExpectFieldValue(L"NAME_LAST", "Smith");
-  ExpectFieldValue(L"ADDRESS_HOME_LINE1", "1234 H St.");
-  ExpectFieldValue(L"ADDRESS_HOME_CITY", "San Jose");
-  ExpectFieldValue(L"ADDRESS_HOME_STATE", "CA");
-  ExpectFieldValue(L"ADDRESS_HOME_ZIP", "95110");
-  ExpectFieldValue(L"PHONE_HOME_WHOLE_NUMBER", "14085554567");
-  ExpectFieldValue(L"PHONE_HOME_CITY_CODE-1", "408");
-  ExpectFieldValue(L"PHONE_HOME_CITY_CODE-2", "408");
-  ExpectFieldValue(L"PHONE_HOME_NUMBER", "5554567");
-  ExpectFieldValue(L"PHONE_HOME_NUMBER_3-1", "555");
-  ExpectFieldValue(L"PHONE_HOME_NUMBER_3-2", "555");
-  ExpectFieldValue(L"PHONE_HOME_NUMBER_4-1", "4567");
-  ExpectFieldValue(L"PHONE_HOME_NUMBER_4-2", "4567");
-  ExpectFieldValue(L"PHONE_HOME_EXT-1", "");
-  ExpectFieldValue(L"PHONE_HOME_EXT-2", "");
-  ExpectFieldValue(L"PHONE_HOME_COUNTRY_CODE-1", "1");
+  ExpectFieldValue("NAME_FIRST", "Bob");
+  ExpectFieldValue("NAME_LAST", "Smith");
+  ExpectFieldValue("ADDRESS_HOME_LINE1", "1234 H St.");
+  ExpectFieldValue("ADDRESS_HOME_CITY", "San Jose");
+  ExpectFieldValue("ADDRESS_HOME_STATE", "CA");
+  ExpectFieldValue("ADDRESS_HOME_ZIP", "95110");
+  ExpectFieldValue("PHONE_HOME_WHOLE_NUMBER", "14085554567");
+  ExpectFieldValue("PHONE_HOME_CITY_CODE-1", "408");
+  ExpectFieldValue("PHONE_HOME_CITY_CODE-2", "408");
+  ExpectFieldValue("PHONE_HOME_NUMBER", "5554567");
+  ExpectFieldValue("PHONE_HOME_NUMBER_3-1", "555");
+  ExpectFieldValue("PHONE_HOME_NUMBER_3-2", "555");
+  ExpectFieldValue("PHONE_HOME_NUMBER_4-1", "4567");
+  ExpectFieldValue("PHONE_HOME_NUMBER_4-2", "4567");
+  ExpectFieldValue("PHONE_HOME_EXT-1", "");
+  ExpectFieldValue("PHONE_HOME_EXT-2", "");
+  ExpectFieldValue("PHONE_HOME_COUNTRY_CODE-1", "1");
 }
 
 // Test profile is saved if phone number is valid in selected country.
 // The data file contains two profiles with valid phone numbers and two
 // profiles with invalid phone numbers from their respective country.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_ProfileSavedWithValidCountryPhone) {
   ASSERT_TRUE(test_server()->Start());
   std::vector<FormMap> profiles;
@@ skipping 116 matching lines @@
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
   profile.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
   profile.SetRawInfo(COMPANY_NAME, ASCIIToUTF16("Company X"));
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("408-871-4567"));
   SetProfile(profile);
 
   GURL url = test_server()->GetURL("files/autofill/read_only_field_test.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("firstname");
 
-  ExpectFieldValue(L"email", "");
-  ExpectFieldValue(L"address", addr_line1);
+  ExpectFieldValue("email", "");
+  ExpectFieldValue("address", addr_line1);
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_FormFillableOnReset FormFillableOnReset
 #else
 #define MAYBE_FormFillableOnReset DISABLED_FormFillableOnReset
 #endif
 // Test form is fillable from a profile after form was reset.
 // Steps:
 //   1. Fill form using a saved profile.
 //   2. Reset the form.
 //   3. Fill form using a saved profile.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillableOnReset) {
   ASSERT_TRUE(test_server()->Start());
 
   CreateTestProfile();
 
   GURL url = test_server()->GetURL("files/autofill/autofill_test_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
   ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
-      L"document.getElementById('testform').reset()"));
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+      "",
+      "document.getElementById('testform').reset()"));
 
   PopulateForm("NAME_FIRST");
 
-  ExpectFieldValue(L"NAME_FIRST", "Milton");
-  ExpectFieldValue(L"NAME_LAST", "Waddams");
-  ExpectFieldValue(L"EMAIL_ADDRESS", "red.swingline@initech.com");
-  ExpectFieldValue(L"ADDRESS_HOME_LINE1", "4120 Freidrich Lane");
-  ExpectFieldValue(L"ADDRESS_HOME_CITY", "Austin");
-  ExpectFieldValue(L"ADDRESS_HOME_STATE", "Texas");
-  ExpectFieldValue(L"ADDRESS_HOME_ZIP", "78744");
-  ExpectFieldValue(L"ADDRESS_HOME_COUNTRY", "United States");
-  ExpectFieldValue(L"PHONE_HOME_WHOLE_NUMBER", "5125551234");
+  ExpectFieldValue("NAME_FIRST", "Milton");
+  ExpectFieldValue("NAME_LAST", "Waddams");
+  ExpectFieldValue("EMAIL_ADDRESS", "red.swingline@initech.com");
+  ExpectFieldValue("ADDRESS_HOME_LINE1", "4120 Freidrich Lane");
+  ExpectFieldValue("ADDRESS_HOME_CITY", "Austin");
+  ExpectFieldValue("ADDRESS_HOME_STATE", "Texas");
+  ExpectFieldValue("ADDRESS_HOME_ZIP", "78744");
+  ExpectFieldValue("ADDRESS_HOME_COUNTRY", "United States");
+  ExpectFieldValue("PHONE_HOME_WHOLE_NUMBER", "5125551234");
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_DistinguishMiddleInitialWithinName \
     DistinguishMiddleInitialWithinName
 #else
 #define MAYBE_DistinguishMiddleInitialWithinName \
     DISABLED_DistinguishMiddleInitialWithinName
 #endif
 // Test Autofill distinguishes a middle initial in a name.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DistinguishMiddleInitialWithinName) {
   ASSERT_TRUE(test_server()->Start());
 
   CreateTestProfile();
 
   GURL url = test_server()->GetURL(
       "files/autofill/autofill_middleinit_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
-  ExpectFieldValue(L"NAME_MIDDLE", "C");
+  ExpectFieldValue("NAME_MIDDLE", "C");
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_MultipleEmailFilledByOneUserGesture \
     MultipleEmailFilledByOneUserGesture
 #else
 #define MAYBE_MultipleEmailFilledByOneUserGesture \
     DISABLED_MultipleEmailFilledByOneUserGesture
 #endif
@@ skipping 10 matching lines @@
   profile.SetRawInfo(NAME_LAST, ASCIIToUTF16("Smith"));
   profile.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16(email));
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("4088714567"));
   SetProfile(profile);
 
   GURL url = test_server()->GetURL(
       "files/autofill/autofill_confirmemail_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
-  ExpectFieldValue(L"EMAIL_CONFIRM", email);
+  ExpectFieldValue("EMAIL_CONFIRM", email);
   // TODO(isherman): verify entire form.
 }
 
 // Test profile not aggregated if email found in non-email field.
 IN_PROC_BROWSER_TEST_F(AutofillTest, ProfileWithEmailInOtherFieldNotSaved) {
   ASSERT_TRUE(test_server()->Start());
 
   FormMap data;
   data["NAME_FIRST"] = "Bob";
   data["NAME_LAST"] = "Smith";
@@ skipping 64 matching lines @@
       "files/autofill/latency_after_submit_test.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
   content::WindowedNotificationObserver load_stop_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<content::NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
 
   ASSERT_TRUE(content::ExecuteJavaScript(
-      render_view_host(), L"",
-      ASCIIToWide("document.getElementById('testform').submit();")));
+      render_view_host(),
+      "",
+      "document.getElementById('testform').submit();"));
   // This will ensure the test didn't hang.
   load_stop_observer.Wait();
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_DisableAutocompleteWhileFilling DisableAutocompleteWhileFilling
 #else
 #define MAYBE_DisableAutocompleteWhileFilling \
     DISABLED_DisableAutocompleteWhileFilling
@@ skipping 10 matching lines @@
 
   // Invoke Autofill: Start filling the first name field with "M" and wait for
   // the popup to be shown.
   FocusFirstNameField();
   SendKeyAndWait(
       ui::VKEY_M, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
   // Now that the popup with suggestions is showing, disable autocomplete for
   // the active field.
   ASSERT_TRUE(content::ExecuteJavaScript(
-      render_view_host(), L"",
-      L"document.querySelector('input').autocomplete = 'off';"));
+      render_view_host(),
+      "",
+      "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
   // autofilled form.
   content::SimulateKeyPress(chrome::GetActiveWebContents(browser()),
                             ui::VKEY_DOWN, false, false, false, false);
 
   // Wait for any IPCs to complete by performing an action that generates an
   // IPC that's easy to wait for.  Chrome shouldn't crash.
   bool result = false;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      render_view_host(), L"",
-      L"var city = document.getElementById('city');"
-      L"city.onfocus = function() { domAutomationController.send(true); };"
-      L"city.focus()",
+      render_view_host(),
+      "",
+      "var city = document.getElementById('city');"
+      "city.onfocus = function() { domAutomationController.send(true); };"
+      "city.focus()",
       &result));
   ASSERT_TRUE(result);
   SendKeyAndWait(
       ui::VKEY_A, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 }
 
 // Test that profiles merge for aggregated data with same address.
 // The criterion for when two profiles are expected to be merged is when their
 // 'Address Line 1' and 'City' data match. When two profiles are merged, any
 // remaining address fields are expected to be overwritten. Any non-address
@@ skipping 22 matching lines @@
 // TODO(isherman): this looks redundant, consider removing.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }