Fix second-profile dir so that it's a sibling of the first; eliminate a FromWStringHack.

chrome/test/live_sync/live_sync_test.cc

 // Copyright (c) 2010 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/live_sync/live_sync_test.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 62 matching lines @@
 // static
 const BookmarkNode* LiveSyncTest::GetByUniqueURL(BookmarkModel* m,
                                                  const GURL& url) {
   std::vector<const BookmarkNode*> nodes;
   m->GetNodesByURL(url, &nodes);
   EXPECT_EQ(1U, nodes.size());
   return nodes[0];
 }
 
 // static
-Profile* LiveSyncTest::MakeProfile(const std::wstring& name) {
+Profile* LiveSyncTest::MakeProfile(const FilePath::CharType* name) {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
-  path.Append(FilePath::FromWStringHack(name));
-  return ProfileManager::CreateProfile(path);
+
+  return ProfileManager::CreateProfile(path.Append(name));
 }
 
 void LiveSyncTest::SetUpInProcessBrowserTestFixture() {
   // We don't take a reference to |resolver|, but mock_host_resolver_override_
   // does, so effectively assumes ownership.
   net::RuleBasedHostResolverProc* resolver =
       new net::RuleBasedHostResolverProc(host_resolver());
   resolver->AllowDirectLookup("*.google.com");
   // Allow direct lookup of thawte.com.  On Linux, we use Chromium's nss
   // implementation which uses ocsp.thawte.com for certificate verification.
   // Without this, running the test case on Linux causes an error as we make an
   // external DNS lookup of "ocsp.thawte.com".
   resolver->AllowDirectLookup("*.thawte.com");
   mock_host_resolver_override_.reset(
       new net::ScopedDefaultHostResolverProc(resolver));
 }
 
 void LiveSyncTest::TearDownInProcessBrowserTestFixture() {
   mock_host_resolver_override_.reset();
 }