Merge navigation list and directory tree.

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
@@ skipping 973 matching lines @@
 WRAPPED_INSTANTIATE_TEST_CASE_P(
     MAYBE_DefaultActionDialog,
     FileManagerBrowserTest,
     ::testing::Values(
         TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDownloads"),
         TestParameter(IN_GUEST_MODE, "defaultActionDialogOnDownloads"),
         TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive")));
 
 // Slow tests are disabled on debug build. http://crbug.com/327719
 #if !defined(NDEBUG)
-#define MAYBE_NavigationList DISABLED_NavigationList
-#else
-#define MAYBE_NavigationList NavigationList
-#endif
-WRAPPED_INSTANTIATE_TEST_CASE_P(
-    MAYBE_NavigationList,
-    FileManagerBrowserTest,
-    ::testing::Values(TestParameter(NOT_IN_GUEST_MODE,
-                                    "traverseNavigationList")));
-
-// Slow tests are disabled on 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")));
@@ skipping 448 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) {
   AddScript("gallery/photo_editor.js");
   set_test_case_name("exposureImageOnDrive");
   StartTest();
 }
 
 }  // namespace
 }  // namespace file_manager