| 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/event_names.h" | 9 #include "chrome/browser/extensions/event_names.h" |
| 10 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system")) | 109 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system")) |
| 110 << message_; | 110 << message_; |
| 111 } | 111 } |
| 112 | 112 |
| 113 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatus) { | 113 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatus) { |
| 114 EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true)); | 114 EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true)); |
| 115 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status")) | 115 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status")) |
| 116 << message_; | 116 << message_; |
| 117 } | 117 } |
| 118 | 118 |
| 119 #if defined(ADDRESS_SANITIZER) || (defined(OS_WIN) && defined(ARCH_CPU_X86)) | 119 #if defined(ADDRESS_SANITIZER) || \ |
| 120 (defined(OS_WIN) && defined(ARCH_CPU_X86)) || defined(SYZYASAN) |
| 120 // SyncFileSystemApiTest.GetFileStatuses fails under AddressSanitizer | 121 // SyncFileSystemApiTest.GetFileStatuses fails under AddressSanitizer |
| 121 // on Precise. See http://crbug.com/230779. | 122 // on Precise. See http://crbug.com/230779. |
| 122 // Also fails on WinXP Tests(1). See crbug.com/354425 . | 123 // Also fails on WinXP Tests(1). See crbug.com/354425 . |
| 123 #define MAYBE_GetFileStatuses DISABLED_GetFileStatuses | 124 #define MAYBE_GetFileStatuses DISABLED_GetFileStatuses |
| 124 #else | 125 #else |
| 125 #define MAYBE_GetFileStatuses GetFileStatuses | 126 #define MAYBE_GetFileStatuses GetFileStatuses |
| 126 #endif | 127 #endif |
| 127 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, MAYBE_GetFileStatuses) { | 128 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, MAYBE_GetFileStatuses) { |
| 128 #if defined(OS_WIN) && defined(USE_ASH) | 129 #if defined(OS_WIN) && defined(USE_ASH) |
| 129 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 130 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) | 219 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) |
| 219 << message_; | 220 << message_; |
| 220 } | 221 } |
| 221 | 222 |
| 222 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetServiceStatus) { | 223 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetServiceStatus) { |
| 223 mock_remote_service()->SetServiceState( | 224 mock_remote_service()->SetServiceState( |
| 224 sync_file_system::REMOTE_SERVICE_AUTHENTICATION_REQUIRED); | 225 sync_file_system::REMOTE_SERVICE_AUTHENTICATION_REQUIRED); |
| 225 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_service_status")) | 226 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_service_status")) |
| 226 << message_; | 227 << message_; |
| 227 } | 228 } |
| OLD | NEW |