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

chrome/test/live_sync/bookmark_model_verifier.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 "chrome/test/live_sync/bookmark_model_verifier.h"
 
 #include <vector>
 #include <stack>
 
 #include "app/tree_node_iterator.h"
@@ skipping 11 matching lines @@
 void BookmarkModelVerifier::ExpectBookmarkInfoMatch(
     const BookmarkNode* expected, const BookmarkNode* actual) {
   EXPECT_EQ(expected->GetTitle(), actual->GetTitle());
   EXPECT_EQ(expected->is_folder(), actual->is_folder());
   EXPECT_EQ(expected->GetURL(), actual->GetURL());
   EXPECT_EQ(expected->GetParent()->IndexOfChild(expected),
             actual->GetParent()->IndexOfChild(actual));
 }
 
 BookmarkModelVerifier::BookmarkModelVerifier() {
-  verifier_profile_.reset(LiveSyncTest::MakeProfile(L"verifier"));
+  verifier_profile_.reset(LiveSyncTest::MakeProfile(
+      FILE_PATH_LITERAL("verifier")));
   verifier_ = verifier_profile_->GetBookmarkModel();
 }
 
 BookmarkModelVerifier* BookmarkModelVerifier::Create() {
   BookmarkModelVerifier* v = new BookmarkModelVerifier();
   LiveSyncTest::BlockUntilLoaded(v->verifier_);
   return v;
 }
 
 void BookmarkModelVerifier::ExpectMatch(BookmarkModel* actual) {
@@ skipping 202 matching lines @@
                                    const GURL& new_url) {
   const BookmarkNode* v_node = NULL;
   FindNodeInVerifier(model, node, &v_node);
   const BookmarkNode* result = bookmark_utils::ApplyEditsWithNoGroupChange(
       model, node->GetParent(), BookmarkEditor::EditDetails(node),
       node->GetTitle(), new_url, NULL);
   bookmark_utils::ApplyEditsWithNoGroupChange(verifier_, v_node->GetParent(),
       BookmarkEditor::EditDetails(v_node), v_node->GetTitle(), new_url, NULL);
   return result;
 }