| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_test_util.h" | 5 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" |
| 6 | 6 |
| 7 #include <memory> |
| 7 #include <utility> | 8 #include <utility> |
| 8 | 9 |
| 9 #include "base/memory/scoped_ptr.h" | |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "chrome/browser/sync_file_system/remote_file_sync_service.h" | 11 #include "chrome/browser/sync_file_system/remote_file_sync_service.h" |
| 12 #include "chrome/browser/sync_file_system/sync_status_code.h" | 12 #include "chrome/browser/sync_file_system/sync_status_code.h" |
| 13 #include "content/public/test/test_utils.h" | 13 #include "content/public/test/test_utils.h" |
| 14 #include "google_apis/drive/drive_api_error_codes.h" | 14 #include "google_apis/drive/drive_api_error_codes.h" |
| 15 | 15 |
| 16 using content::BrowserThread; | 16 using content::BrowserThread; |
| 17 | 17 |
| 18 namespace sync_file_system { | 18 namespace sync_file_system { |
| 19 | 19 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 50 } | 50 } |
| 51 | 51 |
| 52 // Instantiate versions we know callers will need. | 52 // Instantiate versions we know callers will need. |
| 53 template base::Callback<void(SyncStatusCode)> | 53 template base::Callback<void(SyncStatusCode)> |
| 54 AssignAndQuitCallback(base::RunLoop*, SyncStatusCode*); | 54 AssignAndQuitCallback(base::RunLoop*, SyncStatusCode*); |
| 55 | 55 |
| 56 #define INSTANTIATE_RECEIVER(type) \ | 56 #define INSTANTIATE_RECEIVER(type) \ |
| 57 template base::Callback<void(type)> CreateResultReceiver(type*); | 57 template base::Callback<void(type)> CreateResultReceiver(type*); |
| 58 INSTANTIATE_RECEIVER(SyncStatusCode); | 58 INSTANTIATE_RECEIVER(SyncStatusCode); |
| 59 INSTANTIATE_RECEIVER(google_apis::DriveApiErrorCode); | 59 INSTANTIATE_RECEIVER(google_apis::DriveApiErrorCode); |
| 60 INSTANTIATE_RECEIVER(scoped_ptr<RemoteFileSyncService::OriginStatusMap>); | 60 INSTANTIATE_RECEIVER(std::unique_ptr<RemoteFileSyncService::OriginStatusMap>); |
| 61 #undef INSTANTIATE_RECEIVER | 61 #undef INSTANTIATE_RECEIVER |
| 62 | 62 |
| 63 } // namespace sync_file_system | 63 } // namespace sync_file_system |
| OLD | NEW |