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

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Issue 303503004: Change directory if the active list item on navigation list is changed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modify comments. Created 6 years, 6 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/folder_shortcuts.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index 3db922d2ce7837e997c5c82e2331ba740a0debbb..56742aeefe2de44a8200babcbba780427908736d 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -901,6 +901,29 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values(TestParameter(NOT_IN_GUEST_MODE,
"traverseNavigationList")));
+// Unlike TEST/TEST_F, which are macros that expand to further macros,
+// INSTANTIATE_TEST_CASE_P is a macro that expands directly to code that
+// stringizes the arguments. As a result, macros passed as parameters (such as
+// prefix or test_case_name) will not be expanded by the preprocessor. To work
+// around this, indirect the macro for INSTANTIATE_TEST_CASE_P, so that the
+// pre-processor will expand macros such as MAYBE_test_name before
+// instantiating the test.
+#define WRAPPED_INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
+ INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator)
+
+// This test is too slow to run in debug build. http://crbug.com/327719
+#if !defined(NDEBUG)
+#define MAYBE_FolderShortcuts DISABLED_FolderShortcuts
+#else
+#define MAYBE_FolderShortcuts FolderShortcuts
+#endif
+WRAPPED_INSTANTIATE_TEST_CASE_P(
+ MAYBE_FolderShortcuts,
+ FileManagerBrowserTest,
+ ::testing::Values(
+ TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"),
+ TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts")));
+
INSTANTIATE_TEST_CASE_P(
TabIndex,
FileManagerBrowserTest,
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/folder_shortcuts.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698