| 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 TestParameter(NOT_IN_GUEST_MODE, "transferFromDriveToDownloads"), | 284 TestParameter(NOT_IN_GUEST_MODE, "transferFromDriveToDownloads"), |
| 285 TestParameter(NOT_IN_GUEST_MODE, "transferFromDownloadsToDrive"), | 285 TestParameter(NOT_IN_GUEST_MODE, "transferFromDownloadsToDrive"), |
| 286 TestParameter(NOT_IN_GUEST_MODE, "transferFromSharedToDownloads"), | 286 TestParameter(NOT_IN_GUEST_MODE, "transferFromSharedToDownloads"), |
| 287 TestParameter(NOT_IN_GUEST_MODE, "transferFromSharedToDrive"), | 287 TestParameter(NOT_IN_GUEST_MODE, "transferFromSharedToDrive"), |
| 288 TestParameter(NOT_IN_GUEST_MODE, "transferFromRecentToDownloads"), | 288 TestParameter(NOT_IN_GUEST_MODE, "transferFromRecentToDownloads"), |
| 289 TestParameter(NOT_IN_GUEST_MODE, "transferFromRecentToDrive"), | 289 TestParameter(NOT_IN_GUEST_MODE, "transferFromRecentToDrive"), |
| 290 TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDownloads"), | 290 TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDownloads"), |
| 291 TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDrive"))); | 291 TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDrive"))); |
| 292 | 292 |
| 293 // Fails on official build. http://crbug.com/429294 | 293 // Fails on official build. http://crbug.com/429294 |
| 294 // Disabled due to flakiness. https://crbug.com/701924 |
| 294 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) | 295 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) |
| 295 #define MAYBE_RestorePrefs DISABLED_RestorePrefs | 296 #define MAYBE_RestorePrefs DISABLED_RestorePrefs |
| 296 #else | 297 #else |
| 297 #define MAYBE_RestorePrefs RestorePrefs | 298 #define MAYBE_RestorePrefs RestorePrefs |
| 298 #endif | 299 #endif |
| 299 WRAPPED_INSTANTIATE_TEST_CASE_P( | 300 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 300 MAYBE_RestorePrefs, | 301 DISABLED_RestorePrefs, |
| 301 FileManagerBrowserTest, | 302 FileManagerBrowserTest, |
| 302 ::testing::Values(TestParameter(IN_GUEST_MODE, "restoreSortColumn"), | 303 ::testing::Values(TestParameter(IN_GUEST_MODE, "restoreSortColumn"), |
| 303 TestParameter(NOT_IN_GUEST_MODE, "restoreSortColumn"), | 304 TestParameter(NOT_IN_GUEST_MODE, "restoreSortColumn"), |
| 304 TestParameter(IN_GUEST_MODE, "restoreCurrentView"), | 305 TestParameter(IN_GUEST_MODE, "restoreCurrentView"), |
| 305 TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView"))); | 306 TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView"))); |
| 306 | 307 |
| 307 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 308 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| 308 #define MAYBE_ShareDialog DISABLED_ShareDialog | 309 #define MAYBE_ShareDialog DISABLED_ShareDialog |
| 309 #else | 310 #else |
| 310 #define MAYBE_ShareDialog ShareDialog | 311 #define MAYBE_ShareDialog ShareDialog |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 | 705 |
| 705 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { | 706 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { |
| 706 AddAllUsers(); | 707 AddAllUsers(); |
| 707 | 708 |
| 708 // Sanity check that normal operations work in multi-profile setting as well. | 709 // Sanity check that normal operations work in multi-profile setting as well. |
| 709 set_test_case_name("keyboardCopyDrive"); | 710 set_test_case_name("keyboardCopyDrive"); |
| 710 StartTest(); | 711 StartTest(); |
| 711 } | 712 } |
| 712 | 713 |
| 713 } // namespace file_manager | 714 } // namespace file_manager |
| OLD | NEW |