| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 ::testing::Values(TestParameter(IN_GUEST_MODE, "restoreSortColumn"), | 302 ::testing::Values(TestParameter(IN_GUEST_MODE, "restoreSortColumn"), |
| 303 TestParameter(NOT_IN_GUEST_MODE, "restoreSortColumn"), | 303 TestParameter(NOT_IN_GUEST_MODE, "restoreSortColumn"), |
| 304 TestParameter(IN_GUEST_MODE, "restoreCurrentView"), | 304 TestParameter(IN_GUEST_MODE, "restoreCurrentView"), |
| 305 TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView"))); | 305 TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView"))); |
| 306 | 306 |
| 307 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 307 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| 308 #define MAYBE_ShareDialog DISABLED_ShareDialog | 308 #define MAYBE_ShareDialog DISABLED_ShareDialog |
| 309 #else | 309 #else |
| 310 #define MAYBE_ShareDialog ShareDialog | 310 #define MAYBE_ShareDialog ShareDialog |
| 311 #endif | 311 #endif |
| 312 // Flaky: crbug.com/702119. |
| 312 WRAPPED_INSTANTIATE_TEST_CASE_P( | 313 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 313 MAYBE_ShareDialog, | 314 DISABLED_ShareDialog, |
| 314 FileManagerBrowserTest, | 315 FileManagerBrowserTest, |
| 315 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "shareFile"), | 316 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "shareFile"), |
| 316 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); | 317 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); |
| 317 | 318 |
| 318 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 319 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| 319 #define MAYBE_RestoreGeometry DISABLED_RestoreGeometry | 320 #define MAYBE_RestoreGeometry DISABLED_RestoreGeometry |
| 320 #else | 321 #else |
| 321 #define MAYBE_RestoreGeometry RestoreGeometry | 322 #define MAYBE_RestoreGeometry RestoreGeometry |
| 322 #endif | 323 #endif |
| 323 WRAPPED_INSTANTIATE_TEST_CASE_P( | 324 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed"))); | 404 TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed"))); |
| 404 | 405 |
| 405 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 406 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| 406 #define MAYBE_FolderShortcuts DISABLED_FolderShortcuts | 407 #define MAYBE_FolderShortcuts DISABLED_FolderShortcuts |
| 407 #else | 408 #else |
| 408 #define MAYBE_FolderShortcuts FolderShortcuts | 409 #define MAYBE_FolderShortcuts FolderShortcuts |
| 409 #endif | 410 #endif |
| 410 WRAPPED_INSTANTIATE_TEST_CASE_P( | 411 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 411 MAYBE_FolderShortcuts, | 412 MAYBE_FolderShortcuts, |
| 412 FileManagerBrowserTest, | 413 FileManagerBrowserTest, |
| 413 ::testing::Values( | 414 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, |
| 414 TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"), | 415 "traverseFolderShortcuts"))); |
| 415 TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts"))); | 416 // Flaky: crbug.com/702119. |
| 417 // TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts"))); |
| 416 | 418 |
| 417 // Fails on official build. http://crbug.com/429294 | 419 // Fails on official build. http://crbug.com/429294 |
| 418 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) | 420 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) |
| 419 #define MAYBE_SortColumns DISABLED_SortColumns | 421 #define MAYBE_SortColumns DISABLED_SortColumns |
| 420 #else | 422 #else |
| 421 #define MAYBE_SortColumns SortColumns | 423 #define MAYBE_SortColumns SortColumns |
| 422 #endif | 424 #endif |
| 423 WRAPPED_INSTANTIATE_TEST_CASE_P( | 425 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 424 MAYBE_SortColumns, | 426 MAYBE_SortColumns, |
| 425 FileManagerBrowserTest, | 427 FileManagerBrowserTest, |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 #define MAYBE_Providers DISABLED_Providers | 558 #define MAYBE_Providers DISABLED_Providers |
| 557 #else | 559 #else |
| 558 #define MAYBE_Providers Providers | 560 #define MAYBE_Providers Providers |
| 559 #endif | 561 #endif |
| 560 WRAPPED_INSTANTIATE_TEST_CASE_P( | 562 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 561 MAYBE_Providers, | 563 MAYBE_Providers, |
| 562 FileManagerBrowserTest, | 564 FileManagerBrowserTest, |
| 563 ::testing::Values( | 565 ::testing::Values( |
| 564 TestParameter(NOT_IN_GUEST_MODE, "requestMount"), | 566 TestParameter(NOT_IN_GUEST_MODE, "requestMount"), |
| 565 TestParameter(NOT_IN_GUEST_MODE, "requestMountMultipleMounts"), | 567 TestParameter(NOT_IN_GUEST_MODE, "requestMountMultipleMounts"), |
| 566 TestParameter(NOT_IN_GUEST_MODE, "requestMountSourceDevice"), | 568 TestParameter(NOT_IN_GUEST_MODE, "requestMountSourceDevice"))); |
| 567 TestParameter(NOT_IN_GUEST_MODE, "requestMountSourceFile"))); | 569 // Flaky: crbug.com/702119. |
| 570 // TestParameter(NOT_IN_GUEST_MODE, "requestMountSourceFile"))); |
| 568 | 571 |
| 569 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 572 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| 570 #define MAYBE_GearMenu DISABLED_GearMenu | 573 #define MAYBE_GearMenu DISABLED_GearMenu |
| 571 #else | 574 #else |
| 572 #define MAYBE_GearMenu GearMenu | 575 #define MAYBE_GearMenu GearMenu |
| 573 #endif | 576 #endif |
| 574 WRAPPED_INSTANTIATE_TEST_CASE_P( | 577 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 575 DISABLED_GearMenu, | 578 DISABLED_GearMenu, |
| 576 FileManagerBrowserTest, | 579 FileManagerBrowserTest, |
| 577 ::testing::Values( | 580 ::testing::Values( |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 | 707 |
| 705 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { | 708 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { |
| 706 AddAllUsers(); | 709 AddAllUsers(); |
| 707 | 710 |
| 708 // Sanity check that normal operations work in multi-profile setting as well. | 711 // Sanity check that normal operations work in multi-profile setting as well. |
| 709 set_test_case_name("keyboardCopyDrive"); | 712 set_test_case_name("keyboardCopyDrive"); |
| 710 StartTest(); | 713 StartTest(); |
| 711 } | 714 } |
| 712 | 715 |
| 713 } // namespace file_manager | 716 } // namespace file_manager |
| OLD | NEW |