| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/files/file.h" | 8 #include "base/files/file.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 kFlagLoadAsComponent)) | 152 kFlagLoadAsComponent)) |
| 153 << message_; | 153 << message_; |
| 154 } | 154 } |
| 155 | 155 |
| 156 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, ReadDirectory) { | 156 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, ReadDirectory) { |
| 157 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_directory", | 157 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_directory", |
| 158 kFlagLoadAsComponent)) | 158 kFlagLoadAsComponent)) |
| 159 << message_; | 159 << message_; |
| 160 } | 160 } |
| 161 | 161 |
| 162 // http://crbug.com/691449 | 162 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, ReadFile) { |
| 163 #if defined(OS_CHROMEOS) | |
| 164 #define MAYBE_ReadFile DISABLED_ReadFile | |
| 165 #else | |
| 166 #define MAYBE_ReadFile ReadFile | |
| 167 #endif | |
| 168 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, MAYBE_ReadFile) { | |
| 169 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_file", | 163 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_file", |
| 170 kFlagLoadAsComponent)) | 164 kFlagLoadAsComponent)) |
| 171 << message_; | 165 << message_; |
| 172 } | 166 } |
| 173 | 167 |
| 174 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, BigFile) { | 168 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, BigFile) { |
| 175 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/big_file", | 169 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/big_file", |
| 176 kFlagLoadAsComponent)) | 170 kFlagLoadAsComponent)) |
| 177 << message_; | 171 << message_; |
| 178 } | 172 } |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 } | 280 } |
| 287 | 281 |
| 288 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Unresponsive_App) { | 282 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Unresponsive_App) { |
| 289 AbortOnUnresponsivePerformer performer(browser()->profile()); | 283 AbortOnUnresponsivePerformer performer(browser()->profile()); |
| 290 ASSERT_TRUE(RunPlatformAppTestWithFlags( | 284 ASSERT_TRUE(RunPlatformAppTestWithFlags( |
| 291 "file_system_provider/unresponsive_app", kFlagLoadAsComponent)) | 285 "file_system_provider/unresponsive_app", kFlagLoadAsComponent)) |
| 292 << message_; | 286 << message_; |
| 293 } | 287 } |
| 294 | 288 |
| 295 } // namespace extensions | 289 } // namespace extensions |
| OLD | NEW |