| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/chromeos/drive/file_system_util.h" | 9 #include "chrome/browser/chromeos/drive/file_system_util.h" |
| 10 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" | 10 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 FileManagerBrowserTest, | 359 FileManagerBrowserTest, |
| 360 ::testing::Values( | 360 ::testing::Values( |
| 361 TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDownloads"), | 361 TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDownloads"), |
| 362 TestParameter(IN_GUEST_MODE, "executeDefaultTaskOnDownloads"))); | 362 TestParameter(IN_GUEST_MODE, "executeDefaultTaskOnDownloads"))); |
| 363 | 363 |
| 364 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 364 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| 365 #define MAYBE_ExecuteDefaultTaskOnDrive DISABLED_ExecuteDefaultTaskOnDrive | 365 #define MAYBE_ExecuteDefaultTaskOnDrive DISABLED_ExecuteDefaultTaskOnDrive |
| 366 #else | 366 #else |
| 367 #define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive | 367 #define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive |
| 368 #endif | 368 #endif |
| 369 // Flaky: crbug.com/699978 |
| 369 WRAPPED_INSTANTIATE_TEST_CASE_P( | 370 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 370 MAYBE_ExecuteDefaultTaskOnDrive, | 371 DISABLED_ExecuteDefaultTaskOnDrive, |
| 371 FileManagerBrowserTest, | 372 FileManagerBrowserTest, |
| 372 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, | 373 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, |
| 373 "executeDefaultTaskOnDrive"))); | 374 "executeDefaultTaskOnDrive"))); |
| 374 | 375 |
| 375 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 376 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| 376 #define MAYBE_DefaultTaskDialog DISABLED_DefaultTaskDialog | 377 #define MAYBE_DefaultTaskDialog DISABLED_DefaultTaskDialog |
| 377 #else | 378 #else |
| 378 #define MAYBE_DefaultTaskDialog DefaultTaskDialog | 379 #define MAYBE_DefaultTaskDialog DefaultTaskDialog |
| 379 #endif | 380 #endif |
| 380 WRAPPED_INSTANTIATE_TEST_CASE_P( | 381 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 | 698 |
| 698 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { | 699 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { |
| 699 AddAllUsers(); | 700 AddAllUsers(); |
| 700 | 701 |
| 701 // Sanity check that normal operations work in multi-profile setting as well. | 702 // Sanity check that normal operations work in multi-profile setting as well. |
| 702 set_test_case_name("keyboardCopyDrive"); | 703 set_test_case_name("keyboardCopyDrive"); |
| 703 StartTest(); | 704 StartTest(); |
| 704 } | 705 } |
| 705 | 706 |
| 706 } // namespace file_manager | 707 } // namespace file_manager |
| OLD | NEW |