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

chrome/test/live_sync/live_sync_test.h

 // 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.
 
 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
 #define CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
 
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
 
   // Append command line flag to enable sync.
   virtual void SetUpCommandLine(CommandLine* command_line) {
   }
 
   // Helper to get a handle on a bookmark in |m| when the url is known to be
   // unique.
   static const BookmarkNode* GetByUniqueURL(BookmarkModel* m, const GURL& url);
 
   // Helper to ProfileManager::CreateProfile that handles path creation.
-  static Profile* MakeProfile(const std::wstring& name);
+  static Profile* MakeProfile(const FilePath::CharType* name);
 
   // Utility to block (by running the current MessageLoop) until the model has
   // loaded.  Note this is required instead of using m->BlockTillLoaded, as that
   // cannot be called from the main thread (deadlock will occur).
   static void BlockUntilLoaded(BookmarkModel* m);
 
  protected:
   std::string username_;
   std::string password_;
 
   virtual void SetUpInProcessBrowserTestFixture();
   virtual void TearDownInProcessBrowserTestFixture();
 
  private:
   // LiveBookmarksSyncTests need to make live DNS requests for access to
   // GAIA and sync server URLs under google.com.  We use a scoped version
   // to override the default resolver while the test is active.
   scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
 
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_