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

chrome/test/live_sync/two_client_live_bookmarks_sync_test.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 <stdlib.h>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/rand_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 18 matching lines @@
 class TwoClientLiveBookmarksSyncTest : public LiveSyncTest {
  public:
   TwoClientLiveBookmarksSyncTest() {
     // This makes sure browser is visible and active while running test.
     InProcessBrowserTest::set_show_window(true);
     // Set the initial timeout value to 5 min.
     InProcessBrowserTest::SetInitialTimeoutInMS(300000);
   }
   virtual ~TwoClientLiveBookmarksSyncTest() {}
   bool SetupSync() {
-    profile2_.reset(MakeProfile(L"client2"));
+    profile2_.reset(MakeProfile(FILE_PATH_LITERAL("client2")));
     client1_.reset(new ProfileSyncServiceTestHarness(
         browser()->profile(), username_, password_));
     client2_.reset(new ProfileSyncServiceTestHarness(
         profile2_.get(), username_, password_));
     if (ShouldSetupSyncWithRace()) {
       return client1_->SetupSync() && client2_->SetupSync();
     } else {
       bool result_client1 = client1_->SetupSync();
       client1()->AwaitSyncCycleCompletion("Initial setup");
       return result_client1 && client2_->SetupSync();
@@ skipping 2304 matching lines @@
   // Let's compare and make sure both bookmark models are same after sync.
   verifier->ExpectMatch(model_one);
   verifier->ExpectMatch(model_two);
 
   Cleanup();
 }
 
 // Test Scribe ID - 373508.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     MC_SimpleMergeOfDifferentBMModels) {
-  set_profile2(MakeProfile(L"client2"));
+  set_profile2(MakeProfile(FILE_PATH_LITERAL("client2")));
   BookmarkModel* model_one = browser()->profile()->GetBookmarkModel();
   BookmarkModel* model_two = profile2()->GetBookmarkModel();
   LiveSyncTest::BlockUntilLoaded(model_two);
 
   const BookmarkNode* bbn_one = model_one->GetBookmarkBarNode();
   const BookmarkNode* bbn_two = model_two->GetBookmarkBarNode();
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3; index++) {
     wstring title(L"TestBookmark");
@@ skipping 48 matching lines @@
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       model_one, model_two, false);
 
   Cleanup();
 }
 
 // Test Scribe ID - 386586.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     MC_MergeSimpleBMHierarchyUnderBMBar) {
-  set_profile2(MakeProfile(L"client2"));
+  set_profile2(MakeProfile(FILE_PATH_LITERAL("client2")));
   BookmarkModel* model_one = browser()->profile()->GetBookmarkModel();
   BookmarkModel* model_two = profile2()->GetBookmarkModel();
   LiveSyncTest::BlockUntilLoaded(model_two);
 
   const BookmarkNode* bbn_one = model_one->GetBookmarkBarNode();
   const BookmarkNode* bbn_two = model_two->GetBookmarkBarNode();
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3 ; index++) {
     wstring title(L"TestBookmark");
@@ skipping 36 matching lines @@
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       model_one, model_two, false);
 
   Cleanup();
 }
 
 // Test Scribe ID - 386589.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     MC_MergeSimpleBMHierarchyEqualSetsUnderBMBar) {
-  set_profile2(MakeProfile(L"client2"));
+  set_profile2(MakeProfile(FILE_PATH_LITERAL("client2")));
   BookmarkModel* model_one = browser()->profile()->GetBookmarkModel();
   BookmarkModel* model_two = profile2()->GetBookmarkModel();
   LiveSyncTest::BlockUntilLoaded(model_two);
 
   const BookmarkNode* bbn_one = model_one->GetBookmarkBarNode();
   const BookmarkNode* bbn_two = model_two->GetBookmarkBarNode();
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3 ; index++) {
     wstring title(L"TestBookmark");
@@ skipping 20 matching lines @@
   // Wait for changes to propagate.
   ASSERT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));
   // Let's make sure there aren't any duplicates after sync.
   BookmarkModelVerifier::VerifyNoDuplicates(model_one);
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       model_one, model_two, false);
 
   Cleanup();
 }