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

chrome/browser/sync/util/user_settings_unittest.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 entry.
 
+#include <string>
+
 #include "base/file_util.h"
 #include "base/test/test_file_util.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
+#include "chrome/browser/sync/util/character_set_converters.h"
 #include "chrome/browser/sync/util/user_settings.h"
 #include "chrome/browser/sync/util/query_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::UserSettings;
 
 static const PathChar* kV10UserSettingsDB = PSTR("Version10Settings.sqlite3");
 static const PathChar* kOldStyleSyncDataDB = PSTR("OldStyleSyncData.sqlite3");
 
 class UserSettingsTest : public testing::Test {
@@ skipping 15 matching lines @@
               " (email, key, value, "
               "  PRIMARY KEY(email, key) ON CONFLICT REPLACE)");
 
     // Create and populate version table.
     ExecOrDie(primer_handle, "CREATE TABLE db_version ( version )");
     ExecOrDie(primer_handle, "INSERT INTO db_version values ( ? )", 10);
     // Create shares table.
     ExecOrDie(primer_handle, "CREATE TABLE shares"
               " (email, share_name, file_name,"
               "  PRIMARY KEY(email, share_name) ON CONFLICT REPLACE)");
-#if OS_WIN
     // Populate a share.
     ExecOrDie(primer_handle, "INSERT INTO shares values ( ?, ?, ?)",
-              "foo@foo.com", "foo@foo.com", WideToUTF8(kOldStyleSyncDataDB));
-#elif OS_LINUX
-    // Populate a share.
-    ExecOrDie(primer_handle, "INSERT INTO shares values ( ?, ?, ?)",
-              "foo@foo.com", "foo@foo.com", kOldStyleSyncDataDB);
-#endif
+              "foo@foo.com", "foo@foo.com",
+              browser_sync::PathStringToUTF8Quick(kOldStyleSyncDataDB));
     sqlite3_close(primer_handle);
   }
 
   void CleanUpVersion10Databases() {
     ASSERT_TRUE(file_util::DieFileDie(FilePath(kV10UserSettingsDB), false));
     ASSERT_TRUE(file_util::DieFileDie(FilePath(kOldStyleSyncDataDB), false));
     ASSERT_TRUE(file_util::DieFileDie(FilePath(PSTR("SyncData.sqlite3")),
                                       false));
   }
 
@@ skipping 23 matching lines @@
   const int version = sqlite3_column_int(version_query.get(), 0);
   EXPECT_TRUE(11 == version);
   EXPECT_FALSE(file_util::PathExists(FilePath(kOldStyleSyncDataDB)));
 
   PathString path(syncable::DirectoryManager::GetSyncDataDatabaseFilename());
 
   std::string contents;
   ASSERT_TRUE(file_util::ReadFileToString(FilePath(path), &contents));
   EXPECT_TRUE(sync_data() == contents);
 }