Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1004)

Side by Side Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Issue 700023002: Show generic file handler more modestly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 // Browser test for basic Chrome OS file manager functionality: 5 // Browser test for basic Chrome OS file manager functionality:
6 // - The file list is updated when a file is added externally to the Downloads 6 // - The file list is updated when a file is added externally to the Downloads
7 // folder. 7 // folder.
8 // - Selecting a file and copy-pasting it with the keyboard copies the file. 8 // - Selecting a file and copy-pasting it with the keyboard copies the file.
9 // - Selecting a file and pressing delete deletes it. 9 // - Selecting a file and pressing delete deletes it.
10 10
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 WRAPPED_INSTANTIATE_TEST_CASE_P( 1030 WRAPPED_INSTANTIATE_TEST_CASE_P(
1031 MAYBE_DefaultActionDialog, 1031 MAYBE_DefaultActionDialog,
1032 FileManagerBrowserTest, 1032 FileManagerBrowserTest,
1033 ::testing::Values( 1033 ::testing::Values(
1034 TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDownloads"), 1034 TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDownloads"),
1035 TestParameter(IN_GUEST_MODE, "defaultActionDialogOnDownloads"), 1035 TestParameter(IN_GUEST_MODE, "defaultActionDialogOnDownloads"),
1036 TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive"))); 1036 TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive")));
1037 1037
1038 // Slow tests are disabled on debug build. http://crbug.com/327719 1038 // Slow tests are disabled on debug build. http://crbug.com/327719
1039 #if !defined(NDEBUG) 1039 #if !defined(NDEBUG)
1040 #define MAYBE_GenericTask DISABLED_GenericTask
1041 #else
1042 #define MAYBE_GenericTask GenericTask
1043 #endif
1044 WRAPPED_INSTANTIATE_TEST_CASE_P(
1045 MAYBE_GenericTask,
1046 FileManagerBrowserTest,
1047 ::testing::Values(
1048 TestParameter(NOT_IN_GUEST_MODE, "genericTaskIsNotExecuted"),
1049 TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed")));
1050
1051 // Slow tests are disabled on debug build. http://crbug.com/327719
1052 #if !defined(NDEBUG)
1040 #define MAYBE_FolderShortcuts DISABLED_FolderShortcuts 1053 #define MAYBE_FolderShortcuts DISABLED_FolderShortcuts
1041 #else 1054 #else
1042 #define MAYBE_FolderShortcuts FolderShortcuts 1055 #define MAYBE_FolderShortcuts FolderShortcuts
1043 #endif 1056 #endif
1044 WRAPPED_INSTANTIATE_TEST_CASE_P( 1057 WRAPPED_INSTANTIATE_TEST_CASE_P(
1045 MAYBE_FolderShortcuts, 1058 MAYBE_FolderShortcuts,
1046 FileManagerBrowserTest, 1059 FileManagerBrowserTest,
1047 ::testing::Values( 1060 ::testing::Values(
1048 TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"), 1061 TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"),
1049 TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts"))); 1062 TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts")));
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 } 1530 }
1518 1531
1519 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDrive) { 1532 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDrive) {
1520 AddScript("video_player/open_video_files.js"); 1533 AddScript("video_player/open_video_files.js");
1521 set_test_case_name("openSingleVideoOnDrive"); 1534 set_test_case_name("openSingleVideoOnDrive");
1522 StartTest(); 1535 StartTest();
1523 } 1536 }
1524 1537
1525 } // namespace 1538 } // namespace
1526 } // namespace file_manager 1539 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698