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 EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true)); | 109 EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true)); |
110 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status")) | 110 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status")) |
111 << message_; | 111 << message_; |
112 } | 112 } |
113 | 113 |
114 #if defined(ADDRESS_SANITIZER) | 114 #if defined(ADDRESS_SANITIZER) |
115 // SyncFileSystemApiTest.GetFileStatuses fails under AddressSanitizer | 115 // SyncFileSystemApiTest.GetFileStatuses fails under AddressSanitizer |
116 // on Precise. See http://crbug.com/230779. | 116 // on Precise. See http://crbug.com/230779. |
117 #define MAYBE_GetFileStatuses DISABLED_GetFileStatuses | 117 #define MAYBE_GetFileStatuses DISABLED_GetFileStatuses |
118 #else | 118 #else |
119 // Disabled temporarily to allow rolling Blink. Re-enable after | 119 #define MAYBE_GetFileStatuses GetFileStatuses |
120 // https://codereview.chromium.org/22639003/ lands. | |
121 #define MAYBE_GetFileStatuses DISABLED_GetFileStatuses | |
122 #endif | 120 #endif |
123 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, MAYBE_GetFileStatuses) { | 121 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, MAYBE_GetFileStatuses) { |
124 #if defined(OS_WIN) && defined(USE_ASH) | 122 #if defined(OS_WIN) && defined(USE_ASH) |
125 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 123 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
126 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 124 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
127 return; | 125 return; |
128 #endif | 126 #endif |
129 | 127 |
130 // Mocking to return IsConflicting() == true only for the path "Conflicting". | 128 // Mocking to return IsConflicting() == true only for the path "Conflicting". |
131 base::FilePath conflicting = base::FilePath::FromUTF8Unsafe("Conflicting"); | 129 base::FilePath conflicting = base::FilePath::FromUTF8Unsafe("Conflicting"); |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) | 194 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) |
197 << message_; | 195 << message_; |
198 } | 196 } |
199 | 197 |
200 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, ConflictResolutionPolicy) { | 198 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, ConflictResolutionPolicy) { |
201 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) | 199 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) |
202 << message_; | 200 << message_; |
203 } | 201 } |
204 | 202 |
205 } // namespace chrome | 203 } // namespace chrome |
OLD | NEW |