sync: Get rid of the now obsolete character_set_converters.h API.

chrome/browser/sync/util/user_settings_unittest.cc

 // Copyright (c) 2010 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 <limits>
 #include <string>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.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/common/sqlite_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::APEncode;
 using browser_sync::APDecode;
 using browser_sync::ExecOrDie;
-using browser_sync::FilePathToUTF8;
 using browser_sync::UserSettings;
 
 using std::numeric_limits;
 
 static const FilePath::CharType kV10UserSettingsDB[] =
     FILE_PATH_LITERAL("Version10Settings.sqlite3");
 static const FilePath::CharType kV11UserSettingsDB[] =
     FILE_PATH_LITERAL("Version11Settings.sqlite3");
 static const FilePath::CharType kOldStyleSyncDataDB[] =
     FILE_PATH_LITERAL("OldStyleSyncData.sqlite3");
@@ skipping 42 matching lines @@
     ExecOrDie(primer_handle, "CREATE TABLE shares"
               " (email, share_name, file_name,"
               "  PRIMARY KEY(email, share_name) ON CONFLICT REPLACE)");
     // Populate a share.
     {
       SQLStatement statement;
       const char query[] = "INSERT INTO shares values ( ?, ?, ? )";
       statement.prepare(primer_handle, query);
       statement.bind_string(0, "foo@foo.com");
       statement.bind_string(1, "foo@foo.com");
-      statement.bind_string(2, FilePathToUTF8(old_style_sync_data_path_));
+#if defined(OS_WIN)
+      statement.bind_string(2, WideToUTF8(old_style_sync_data_path_.value()));
+#elif defined(OS_POSIX)
+      statement.bind_string(2, old_style_sync_data_path_.value());
+#endif
       if (SQLITE_DONE != statement.step()) {
         LOG(FATAL) << query << "\n" << sqlite3_errmsg(primer_handle);
       }
     }
   }
 
    // Creates and populates the V11 database file within
   // |destination_directory|.
   void SetUpVersion11Database(const FilePath& destination_directory) {
     sqlite3* primer_handle = NULL;
@@ skipping 151 matching lines @@
   UserSettings settings;
   settings.Init(temp_dir.path().AppendASCII("UserSettings.sqlite3"));
   settings.SetAuthTokenForService("username", "service", "012345beefbeef");
   std::string username;
   std::string token;
   ASSERT_TRUE(settings.GetLastUserAndServiceToken("service", &username,
       &token));
   EXPECT_EQ("012345beefbeef", token);
   EXPECT_EQ("username", username);
 }