String cleanup in sync code

chrome/browser/sync/glue/sync_backend_host.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
+#include "base/file_path.h"
+#include "base/file_util.h"
 #include "base/file_version_info.h"
-#include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/glue/http_bridge.h"
 #include "chrome/browser/sync/glue/bookmark_model_worker.h"
 #include "webkit/glue/webkit_glue.h"
 
 static const int kSaveChangesIntervalSeconds = 10;
 static const char kGaiaServiceId[] = "chromiumsync";
@@ skipping 149 matching lines @@
     sync_api::HttpPostProviderFactory* http_provider_factory,
     sync_api::HttpPostProviderFactory* auth_http_provider_factory) {
   DCHECK(MessageLoop::current() == host_->core_thread_.message_loop());
 
   // Make sure that the directory exists before initializing the backend.
   // If it already exists, this will do no harm.
   bool success = file_util::CreateDirectory(host_->sync_data_folder_path());
   DCHECK(success);
 
   syncapi_->SetObserver(this);
-  string16 path_str;
-#if defined (OS_WIN)
-  path_str = host_->sync_data_folder_path().value();
-#elif defined(OS_LINUX) || defined(OS_MACOSX)
-  path_str = UTF8ToUTF16(host_->sync_data_folder_path().value());
-#endif
-  success = syncapi_->Init(path_str.c_str(),
+  const FilePath& path_str = host_->sync_data_folder_path();
+  success = syncapi_->Init(path_str,
       (service_url.host() + service_url.path()).c_str(),
       service_url.EffectiveIntPort(),
       kGaiaServiceId,
       kGaiaSourceForChrome,
       service_url.SchemeIsSecure(),
       http_provider_factory,
       auth_http_provider_factory,
       bookmark_model_worker,
       attempt_last_user_authentication,
       MakeUserAgentForSyncapi().c_str());
@@ skipping 110 matching lines @@
   save_changes_timer_.Start(
       base::TimeDelta::FromSeconds(kSaveChangesIntervalSeconds),
       this, &Core::SaveChanges);
 }
 
 void SyncBackendHost::Core::SaveChanges() {
   syncapi_->SaveChanges();
 }
 
 }  // namespace browser_sync