| 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 "base/files/file.h" | 5 #include "base/files/file.h" |
| 6 #include "base/macros.h" |
| 6 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/memory/scoped_vector.h" | 8 #include "base/memory/scoped_vector.h" |
| 8 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
| 9 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| 10 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/chromeos/file_system_provider/notification_manager_inte
rface.h" | 12 #include "chrome/browser/chromeos/file_system_provider/notification_manager_inte
rface.h" |
| 12 #include "chrome/browser/chromeos/file_system_provider/observer.h" | 13 #include "chrome/browser/chromeos/file_system_provider/observer.h" |
| 13 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info
.h" | 14 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info
.h" |
| 14 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_inte
rface.h" | 15 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_inte
rface.h" |
| 15 #include "chrome/browser/chromeos/file_system_provider/request_manager.h" | 16 #include "chrome/browser/chromeos/file_system_provider/request_manager.h" |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 } | 279 } |
| 279 | 280 |
| 280 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Unresponsive_App) { | 281 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Unresponsive_App) { |
| 281 AbortOnUnresponsivePerformer performer(browser()->profile()); | 282 AbortOnUnresponsivePerformer performer(browser()->profile()); |
| 282 ASSERT_TRUE(RunPlatformAppTestWithFlags( | 283 ASSERT_TRUE(RunPlatformAppTestWithFlags( |
| 283 "file_system_provider/unresponsive_app", kFlagLoadAsComponent)) | 284 "file_system_provider/unresponsive_app", kFlagLoadAsComponent)) |
| 284 << message_; | 285 << message_; |
| 285 } | 286 } |
| 286 | 287 |
| 287 } // namespace extensions | 288 } // namespace extensions |
| OLD | NEW |