Fix to use FilePath in more unittests.

base/sys_info_unittest.cc

 // Copyright (c) 2008 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/file_util.h"
 #include "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 typedef PlatformTest SysInfoTest;
 
 TEST_F(SysInfoTest, NumProcs) {
   // We aren't actually testing that it's correct, just that it's sane.
   EXPECT_GE(base::SysInfo::NumberOfProcessors(), 1);
 }
 
 TEST_F(SysInfoTest, AmountOfMem) {
   // We aren't actually testing that it's correct, just that it's sane.
   EXPECT_GT(base::SysInfo::AmountOfPhysicalMemory(), 0);
   EXPECT_GT(base::SysInfo::AmountOfPhysicalMemoryMB(), 0);
 }
 
 TEST_F(SysInfoTest, AmountOfFreeDiskSpace) {
   // We aren't actually testing that it's correct, just that it's sane.
-  std::wstring tmp_path;
+  FilePath tmp_path;
   ASSERT_TRUE(file_util::GetTempDir(&tmp_path));
-  EXPECT_GT(base::SysInfo::AmountOfFreeDiskSpace(tmp_path), 0) << tmp_path;
+  EXPECT_GT(base::SysInfo::AmountOfFreeDiskSpace(tmp_path.ToWStringHack()), 0)
+            << tmp_path.value();
 }
 
 TEST_F(SysInfoTest, GetEnvVar) {
   // Every setup should have non-empty PATH...
   EXPECT_NE(base::SysInfo::GetEnvVar(L"PATH"), L"");
 }
 
 TEST_F(SysInfoTest, HasEnvVar) {
   // Every setup should have PATH...
   EXPECT_TRUE(base::SysInfo::HasEnvVar(L"PATH"));
@@ skipping 54 matching lines @@
   base::SysInfo::ParseLsbRelease(lsb_release,
                                  &os_major_version,
                                  &os_minor_version,
                                  &os_bugfix_version);
   EXPECT_EQ(os_major_version, -1);
   EXPECT_EQ(os_minor_version, -1);
   EXPECT_EQ(os_bugfix_version, -1);
 }
 
 #endif  // OS_CHROMEOS