Remove wstring from RVH's run Javascript command....

chrome/browser/dom_ui/new_tab_ui_uitest.cc

 // Copyright (c) 2011 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/test/ui/ui_test.h"
 
 #include "base/test/test_timeouts.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 40 matching lines @@
   ASSERT_TRUE(window.get());
 
   ASSERT_TRUE(window->SetStringPreference(prefs::kGoogleServicesUsername,
                                           "user@gmail.com"));
   // Bring up a new tab page.
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
 
   scoped_refptr<TabProxy> tab = window->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
-  std::wstring displayed_username;
   // The login span should be eventually populated and have the
   // correct value.
   ASSERT_TRUE(WaitUntilJavaScriptCondition(tab, L"",
       L"window.domAutomationController.send("
       L"document.getElementById('login-username').innerText.length > 0)",
       TestTimeouts::action_max_timeout_ms()));
 
+  string16 displayed_username;
   ASSERT_TRUE(tab->ExecuteAndExtractString(
-      L"",
-      L"window.domAutomationController.send("
-      L"document.getElementById('login-username').innerText)",
+      string16(),
+      ASCIIToUTF16("window.domAutomationController.send("
+                   "document.getElementById('login-username').innerText)"),
       &displayed_username));
 
-  EXPECT_EQ(L"user@gmail.com", displayed_username);
+  EXPECT_EQ(ASCIIToUTF16("user@gmail.com"), displayed_username);
 }
 
 // Loads about:hang into two NTP tabs, ensuring we don't crash.
 // See http://crbug.com/59859.
 TEST_F(NewTabUITest, AboutHangInNTP) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   // Bring up a new tab page.
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
@@ skipping 52 matching lines @@
 
   // Go to the "new tab page" using its old url, rather than chrome://newtab.
   scoped_refptr<TabProxy> tab = window->GetTab(0);
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURLAsync(GURL("chrome-internal:")));
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
   // Ensure there are some thumbnails loaded in the page.
   int thumbnails_count = -1;
-  ASSERT_TRUE(tab->ExecuteAndExtractInt(L"",
-      L"window.domAutomationController.send("
-      L"document.getElementsByClassName('thumbnail-container').length)",
+  ASSERT_TRUE(tab->ExecuteAndExtractInt(
+      string16(),
+      ASCIIToUTF16("window.domAutomationController.send("
+          "document.getElementsByClassName('thumbnail-container').length)"),
       &thumbnails_count));
   EXPECT_GT(thumbnails_count, 0);
 }
 
 // Flaky on XP bots: http://crbug.com/51726
 TEST_F(NewTabUITest, FLAKY_UpdateUserPrefsVersion) {
   // PrefService with JSON user-pref file only, no enforced or advised prefs.
   scoped_ptr<PrefService> prefs(new TestingPrefService);
 
   // Does the migration
   NewTabUI::RegisterUserPrefs(prefs.get());
 
   ASSERT_EQ(NewTabUI::current_pref_version(),
             prefs->GetInteger(prefs::kNTPPrefVersion));
 
   // Reset the version
   prefs->ClearPref(prefs::kNTPPrefVersion);
   ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion));
 
   bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_TRUE(migrated);
   ASSERT_EQ(NewTabUI::current_pref_version(),
             prefs->GetInteger(prefs::kNTPPrefVersion));
 
   migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_FALSE(migrated);
 }