Made sync code build and pass unit tests on OS X.

chrome/test/sync/engine/test_directory_setter_upper.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 "chrome/test/sync/engine/test_directory_setter_upper.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/util/character_set_converters.h"
@@ skipping 67 matching lines @@
 void ManuallyOpenedTestDirectorySetterUpper::Open() {
   ASSERT_TRUE(manager()->Open(name()));
   was_opened_ = true;
 }
 
 void ManuallyOpenedTestDirectorySetterUpper::TearDown() {
   if (was_opened_) {
     TestDirectorySetterUpper::TearDown();
   }
 }
-    
-static PathString UTF8ToPathStringQuick(const std::string &str) {       
-  PathString ret;       
-  CHECK(browser_sync::UTF8ToPathString(str.data(), str.size(), &ret));  
-  return ret;   
-}
 
 TriggeredOpenTestDirectorySetterUpper::TriggeredOpenTestDirectorySetterUpper(
     const std::string& name)
     : TestDirectorySetterUpper(UTF8ToPathStringQuick(name)) {
 }
 
 void TriggeredOpenTestDirectorySetterUpper::SetUp() {
   Init();
 }
 
 void TriggeredOpenTestDirectorySetterUpper::TearDown() {
   DirectoryManager::DirNames names;
   manager()->GetOpenDirectories(&names);
   if (!names.empty()) {
     ASSERT_EQ(1U, names.size());
     ASSERT_EQ(name(), names[0]);
     TestDirectorySetterUpper::TearDown();
   }
 }
 
 }  // namespace browser_sync