Fix to use FilePath in more unittests.

chrome/installer/setup/setup_util_unittest.cc

 // Copyright (c) 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 <windows.h>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 117 matching lines @@
       installer_util::master_preferences::kAltShortcutText));
   EXPECT_FALSE(installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kSystemLevel));
   EXPECT_FALSE(installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kVerboseLogging));
 }
 
 // Test that we are parsing Chrome version correctly.
 TEST_F(SetupUtilTest, GetVersionFromDirTest) {
   // Create a version dir
-  std::wstring chrome_dir(test_dir_.value());
-  file_util::AppendToPath(&chrome_dir, L"1.0.0.0");
-  CreateDirectory(chrome_dir.c_str(), NULL);
+  FilePath chrome_dir = test_dir_.AppendASCII("1.0.0.0");
+  file_util::CreateDirectory(chrome_dir);
   ASSERT_TRUE(file_util::PathExists(chrome_dir));
   scoped_ptr<installer::Version> version(
       setup_util::GetVersionFromDir(test_dir_.value()));
   ASSERT_TRUE(version->GetString() == L"1.0.0.0");
 
   file_util::Delete(chrome_dir, true);
   ASSERT_FALSE(file_util::PathExists(chrome_dir));
   ASSERT_TRUE(setup_util::GetVersionFromDir(test_dir_.value()) == NULL);
 
-  chrome_dir = test_dir_.value();
-  file_util::AppendToPath(&chrome_dir, L"ABC");
-  CreateDirectory(chrome_dir.c_str(), NULL);
+  chrome_dir = test_dir_.AppendASCII("ABC");
+  file_util::CreateDirectory(chrome_dir);
   ASSERT_TRUE(file_util::PathExists(chrome_dir));
   ASSERT_TRUE(setup_util::GetVersionFromDir(test_dir_.value()) == NULL);
 
-  chrome_dir = test_dir_.value();
-  file_util::AppendToPath(&chrome_dir, L"2.3.4.5");
-  CreateDirectory(chrome_dir.c_str(), NULL);
+  chrome_dir = test_dir_.AppendASCII("2.3.4.5");
+  file_util::CreateDirectory(chrome_dir);
   ASSERT_TRUE(file_util::PathExists(chrome_dir));
   version.reset(setup_util::GetVersionFromDir(test_dir_.value()));
   ASSERT_TRUE(version->GetString() == L"2.3.4.5");
 }