| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 11 #include "base/synchronization/waitable_event.h" | 11 #include "base/synchronization/waitable_event.h" |
| 12 #include "chrome/browser/sync_file_system/local_file_sync_service.h" | 12 #include "chrome/browser/sync_file_system/local_file_sync_service.h" |
| 13 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h" | 13 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h" |
| 14 #include "chrome/browser/sync_file_system/sync_event_observer.h" | 14 #include "chrome/browser/sync_file_system/sync_event_observer.h" |
| 15 #include "chrome/browser/sync_file_system/sync_file_system_service.h" | 15 #include "chrome/browser/sync_file_system/sync_file_system_service.h" |
| 16 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" | 16 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" |
| 17 #include "chrome/test/base/testing_profile.h" | 17 #include "chrome/test/base/testing_profile.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
| 19 #include "webkit/fileapi/file_system_context.h" | 19 #include "webkit/browser/fileapi/file_system_context.h" |
| 20 #include "webkit/fileapi/syncable/canned_syncable_file_system.h" | 20 #include "webkit/fileapi/syncable/canned_syncable_file_system.h" |
| 21 #include "webkit/fileapi/syncable/local_file_sync_context.h" | 21 #include "webkit/fileapi/syncable/local_file_sync_context.h" |
| 22 #include "webkit/fileapi/syncable/mock_sync_status_observer.h" | 22 #include "webkit/fileapi/syncable/mock_sync_status_observer.h" |
| 23 #include "webkit/fileapi/syncable/sync_callbacks.h" | 23 #include "webkit/fileapi/syncable/sync_callbacks.h" |
| 24 #include "webkit/fileapi/syncable/sync_file_metadata.h" | 24 #include "webkit/fileapi/syncable/sync_file_metadata.h" |
| 25 #include "webkit/fileapi/syncable/sync_status_code.h" | 25 #include "webkit/fileapi/syncable/sync_status_code.h" |
| 26 #include "webkit/fileapi/syncable/syncable_file_system_util.h" | 26 #include "webkit/fileapi/syncable/syncable_file_system_util.h" |
| 27 | 27 |
| 28 using fileapi::FileSystemURL; | 28 using fileapi::FileSystemURL; |
| 29 using fileapi::FileSystemURLSet; | 29 using fileapi::FileSystemURLSet; |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 base::Bind(&AssignValueAndQuit<SyncFileStatus>, | 484 base::Bind(&AssignValueAndQuit<SyncFileStatus>, |
| 485 &run_loop, &status, &sync_file_status)); | 485 &run_loop, &status, &sync_file_status)); |
| 486 run_loop.Run(); | 486 run_loop.Run(); |
| 487 | 487 |
| 488 EXPECT_EQ(SYNC_STATUS_OK, status); | 488 EXPECT_EQ(SYNC_STATUS_OK, status); |
| 489 EXPECT_EQ(SYNC_FILE_STATUS_CONFLICTING, sync_file_status); | 489 EXPECT_EQ(SYNC_FILE_STATUS_CONFLICTING, sync_file_status); |
| 490 } | 490 } |
| 491 } | 491 } |
| 492 | 492 |
| 493 } // namespace sync_file_system | 493 } // namespace sync_file_system |
| OLD | NEW |