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

chrome/browser/sync/util/character_set_converters.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_UTIL_CHARACTER_SET_CONVERTERS_H_
 #define CHROME_BROWSER_SYNC_UTIL_CHARACTER_SET_CONVERTERS_H_
 
 // A pair of classes to convert UTF8 <-> UCS2 character strings.
 //
 // Note that the current implementation is limited to UCS2, whereas the
@@ skipping 118 matching lines @@
   return AppendUTF8ToPathString(utf8.data(), utf8.length(), output_string);
 }
 
 // Converts UCS2 string wide to UTF8 encoding and appends the result to
 // output_string.
 inline void AppendPathStringToUTF8(const PathString& wide,
                                    std::string* output_string) {
   return AppendPathStringToUTF8(wide.data(), wide.length(), output_string);
 }
 
+// Versions of UTF8ToPathString/PathStringToUTF8 that return the converted
+// string directly.  Any errors encountered will CHECK().  These functions are
+// intended to be used only for testing.
+
+inline PathString UTF8ToPathStringQuick(const std::string &utf8) {
+  PathString wide;
+  CHECK(UTF8ToPathString(utf8.data(), utf8.size(), &wide));
+  return wide;
+}
+
+inline std::string PathStringToUTF8Quick(const PathString& wide) {
+  std::string utf8;
+  PathStringToUTF8(wide.data(), wide.size(), &utf8);
+  return utf8;
+}
 
 inline bool Append(const PathChar* wide, int size,
                    std::string* output_string) {
   AppendPathStringToUTF8(wide, size, output_string);
   return true;
 }
 
 inline bool Append(const PathChar* wide, std::string* output_string) {
   AppendPathStringToUTF8(wide, PathLen(wide), output_string);
   return true;
@@ skipping 74 matching lines @@
 inline PathString::size_type ToPathString::length() const {
   DCHECK(good_ && good_checked_);
   return result_.length();
 }
 
 void TrimPathStringToValidCharacter(PathString* string);
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_UTIL_CHARACTER_SET_CONVERTERS_H_