Reliability test porting: stringy stuff....

chrome/common/logging_chrome_uitest.cc

 // Copyright (c) 2006-2009 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 <windows.h>
 
 #include "base/command_line.h"
 #include "base/basictypes.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 27 matching lines @@
 
    private:
     wchar_t environment_filename_[MAX_PATH];  // Saves real environment value.
   };
 };
 
 // Tests the log file name getter without an environment variable.
 TEST_F(ChromeLoggingTest, LogFileName) {
   SaveEnvironmentVariable(std::wstring());
 
-  std::wstring filename = logging::GetLogFileName();
-  ASSERT_NE(std::wstring::npos, filename.find(L"chrome_debug.log"));
+  FilePath filename = logging::GetLogFileName();
+  ASSERT_NE(FilePath::StringType::npos,
+            filename.value().find(FILE_PATH_LITERAL("chrome_debug.log")));
 
   RestoreEnvironmentVariable();
 }
 
 // Tests the log file name getter with an environment variable.
 TEST_F(ChromeLoggingTest, EnvironmentLogFileName) {
   SaveEnvironmentVariable(std::wstring(L"test value"));
 
-  std::wstring filename = logging::GetLogFileName();
-  ASSERT_EQ(std::wstring(L"test value"), filename);
+  FilePath filename = logging::GetLogFileName();
+  ASSERT_EQ(FilePath(FILE_PATH_LITERAL("test value")).value(),
+            filename.value());
 
   RestoreEnvironmentVariable();
 }
 
 #ifndef NDEBUG  // We don't have assertions in release builds.
 // Tests whether we correctly fail on browser assertions during tests.
 class AssertionTest : public UITest {
  protected:
  AssertionTest() : UITest()
   {
@@ skipping 56 matching lines @@
   }
 };
 
 // Launch the app in browser crash test mode.
 // This test is disabled. See bug 6910.
 TEST_F(BrowserCrashTest, DISABLED_Crash) {
   // Wait while the process is writing the crash dump.
   PlatformThread::Sleep(5000);
   expected_crashes_ = 1;
 }