| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" | 5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 SyncFileSystemService* service = new SyncFileSystemService(profile); | 58 SyncFileSystemService* service = new SyncFileSystemService(profile); |
| 59 | 59 |
| 60 scoped_ptr<LocalFileSyncService> local_file_service = | 60 scoped_ptr<LocalFileSyncService> local_file_service = |
| 61 LocalFileSyncService::Create(profile); | 61 LocalFileSyncService::Create(profile); |
| 62 | 62 |
| 63 scoped_ptr<RemoteFileSyncService> remote_file_service; | 63 scoped_ptr<RemoteFileSyncService> remote_file_service; |
| 64 if (mock_remote_file_service_) { | 64 if (mock_remote_file_service_) { |
| 65 remote_file_service = mock_remote_file_service_.Pass(); | 65 remote_file_service = mock_remote_file_service_.Pass(); |
| 66 } else if (IsV2Enabled()) { | 66 } else if (IsV2Enabled()) { |
| 67 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( | 67 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( |
| 68 RemoteFileSyncService::V2, context); | 68 RemoteFileSyncService::V2, context, service->task_logger()); |
| 69 } else { | 69 } else { |
| 70 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( | 70 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( |
| 71 RemoteFileSyncService::V1, context); | 71 RemoteFileSyncService::V1, context, service->task_logger()); |
| 72 } | 72 } |
| 73 | 73 |
| 74 service->Initialize(local_file_service.Pass(), | 74 service->Initialize(local_file_service.Pass(), |
| 75 remote_file_service.Pass()); | 75 remote_file_service.Pass()); |
| 76 return service; | 76 return service; |
| 77 } | 77 } |
| 78 | 78 |
| 79 } // namespace sync_file_system | 79 } // namespace sync_file_system |
| OLD | NEW |