Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / sync_file_system_service_factory.cc

diff --git a/src/chrome/browser/sync_file_system/sync_file_system_service_factory.cc b/src/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
index 27e3105..69ccbc5 100644 (file)
--- a/src/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
+++ b/src/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
@@ -45,10 +45,7 @@ SyncFileSystemServiceFactory::SyncFileSystemServiceFactory()
   typedef std::set<BrowserContextKeyedServiceFactory*> FactorySet;
   FactorySet factories;
   factories.insert(extensions::ExtensionRegistryFactory::GetInstance());
-  RemoteFileSyncService::AppendDependsOnFactories(
-      RemoteFileSyncService::V1, &factories);
-  RemoteFileSyncService::AppendDependsOnFactories(
-      RemoteFileSyncService::V2, &factories);
+  RemoteFileSyncService::AppendDependsOnFactories(&factories);
   for (FactorySet::iterator iter = factories.begin();
        iter != factories.end();
        ++iter) {
@@ -73,12 +70,9 @@ KeyedService* SyncFileSystemServiceFactory::BuildServiceInstanceFor(
   scoped_ptr<RemoteFileSyncService> remote_file_service;
   if (mock_remote_file_service_) {
     remote_file_service = mock_remote_file_service_.Pass();
-  } else if (IsV2Enabled()) {
-    remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
-        RemoteFileSyncService::V2, context, service->task_logger());
   } else {
     remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
-        RemoteFileSyncService::V1, context, service->task_logger());
+        context, service->task_logger());
   }
 
   service->Initialize(local_file_service.Pass(),