| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "chrome/browser/extensions/event_names.h" | 8 #include "chrome/browser/extensions/event_names.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" | 10 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" |
| 11 #include "chrome/browser/sync_file_system/file_status_observer.h" | 11 #include "chrome/browser/sync_file_system/file_status_observer.h" |
| 12 #include "chrome/browser/sync_file_system/local_change_processor.h" | 12 #include "chrome/browser/sync_file_system/local_change_processor.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_file_system_service.h" | 14 #include "chrome/browser/sync_file_system/sync_file_system_service.h" |
| 15 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" | 15 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" |
| 16 #include "chrome/common/chrome_version_info.h" | 16 #include "chrome/common/chrome_version_info.h" |
| 17 #include "testing/gmock/include/gmock/gmock.h" | 17 #include "testing/gmock/include/gmock/gmock.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
| 19 #include "webkit/fileapi/file_system_url.h" | 19 #include "webkit/common/fileapi/file_system_url.h" |
| 20 #include "webkit/fileapi/syncable/sync_status_code.h" | 20 #include "webkit/fileapi/syncable/sync_status_code.h" |
| 21 #include "webkit/fileapi/syncable/syncable_file_system_util.h" | 21 #include "webkit/fileapi/syncable/syncable_file_system_util.h" |
| 22 #include "webkit/quota/quota_manager.h" | 22 #include "webkit/quota/quota_manager.h" |
| 23 | 23 |
| 24 using ::testing::_; | 24 using ::testing::_; |
| 25 using ::testing::Eq; | 25 using ::testing::Eq; |
| 26 using ::testing::Ne; | 26 using ::testing::Ne; |
| 27 using ::testing::Property; | 27 using ::testing::Property; |
| 28 using ::testing::Return; | 28 using ::testing::Return; |
| 29 using fileapi::FileSystemURL; | 29 using fileapi::FileSystemURL; |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) | 187 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) |
| 188 << message_; | 188 << message_; |
| 189 } | 189 } |
| 190 | 190 |
| 191 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, ConflictResolutionPolicy) { | 191 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, ConflictResolutionPolicy) { |
| 192 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) | 192 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) |
| 193 << message_; | 193 << message_; |
| 194 } | 194 } |
| 195 | 195 |
| 196 } // namespace chrome | 196 } // namespace chrome |
| OLD | NEW |