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

chrome/browser/ui/tests/browser_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 "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_timeouts.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
@@ skipping 198 matching lines @@
   // At this point the modal dialog should not be showing.
   int window_count = 0;
   EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   EXPECT_EQ(1, window_count);
 
   // Verify that we set a mark on successful dialog show.
   scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0);
   ASSERT_TRUE(browser.get());
   scoped_refptr<TabProxy> tab = browser->GetActiveTab();
   ASSERT_TRUE(tab.get());
-  std::wstring title;
+  string16 title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_EQ(L"SUCCESS", title);
+  ASSERT_EQ(ASCIIToUTF16("SUCCESS"), title);
 }
 
 class SecurityTest : public UITest {
 };
 
 TEST_F(SecurityTest, DisallowFileUrlUniversalAccessTest) {
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   FilePath test_file(test_data_directory_);
@@ skipping 34 matching lines @@
 #endif  // !defined(OS_MACOSX)
 
 #if defined(OS_WIN)
 // This test verifies that Chrome can be launched with a user-data-dir path
 // which contains non ASCII characters.
 class LaunchBrowserWithNonAsciiUserDatadir : public UITest {
 public:
   void SetUp() {
     PathService::Get(base::DIR_TEMP, &tmp_profile_);
     tmp_profile_ = tmp_profile_.AppendASCII("tmp_profile");
-    tmp_profile_ = tmp_profile_.Append(L"Test Chrome G�raldine");
+    tmp_profile_ = tmp_profile_.Append(L"Test Chrome G\u00E9raldine");

[Evan Martin, 2011/02/04 21:37:29]

Good fix!

[Avi (use Gerrit), 2011/02/04 23:02:11]

Presubmit complained. Why does no one listen?

 
     // Create a fresh, empty copy of this directory.
     file_util::Delete(tmp_profile_, true);
     file_util::CreateDirectory(tmp_profile_);
 
     launch_arguments_.AppendSwitchPath(switches::kUserDataDir, tmp_profile_);
   }
 
   bool LaunchAppWithProfile() {
     UITest::SetUp();
@@ skipping 85 matching lines @@
   EXPECT_EQ(0, window_count);
 
   // Starting a browser window should work just fine.
   ASSERT_TRUE(IsBrowserRunning());
   ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   EXPECT_EQ(1, window_count);
 }
 
 }  // namespace