| 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/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/sync_file_system/file_status_observer.h" | 10 #include "chrome/browser/sync_file_system/file_status_observer.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 mock_remote_service->NotifyFileStatusChanged( | 112 mock_remote_service->NotifyFileStatusChanged( |
| 113 mock_url, | 113 mock_url, |
| 114 file_type, | 114 file_type, |
| 115 sync_file_status, | 115 sync_file_status, |
| 116 sync_action_taken, | 116 sync_action_taken, |
| 117 sync_direction); | 117 sync_direction); |
| 118 } | 118 } |
| 119 | 119 |
| 120 } // namespace | 120 } // namespace |
| 121 | 121 |
| 122 // http://crbug.com/421141 | 122 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatus) { |
| 123 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_GetFileStatus) { | |
| 124 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status")) | 123 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status")) |
| 125 << message_; | 124 << message_; |
| 126 } | 125 } |
| 127 | 126 |
| 128 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatuses) { | 127 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatuses) { |
| 129 // Mocking to return IsConflicting() == true only for the path "Conflicting". | 128 // Mocking to return IsConflicting() == true only for the path "Conflicting". |
| 130 base::FilePath conflicting = base::FilePath::FromUTF8Unsafe("Conflicting"); | 129 base::FilePath conflicting = base::FilePath::FromUTF8Unsafe("Conflicting"); |
| 131 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_statuses")) | 130 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_statuses")) |
| 132 << message_; | 131 << message_; |
| 133 } | 132 } |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) | 193 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) |
| 195 << message_; | 194 << message_; |
| 196 } | 195 } |
| 197 | 196 |
| 198 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetServiceStatus) { | 197 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetServiceStatus) { |
| 199 mock_remote_service()->SetServiceState( | 198 mock_remote_service()->SetServiceState( |
| 200 sync_file_system::REMOTE_SERVICE_AUTHENTICATION_REQUIRED); | 199 sync_file_system::REMOTE_SERVICE_AUTHENTICATION_REQUIRED); |
| 201 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_service_status")) | 200 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_service_status")) |
| 202 << message_; | 201 << message_; |
| 203 } | 202 } |
| OLD | NEW |