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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 | 670 |
671 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, | 671 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, |
672 MAYBE_BasicDownloads) { | 672 MAYBE_BasicDownloads) { |
673 AddAllUsers(); | 673 AddAllUsers(); |
674 | 674 |
675 // Sanity check that normal operations work in multi-profile setting as well. | 675 // Sanity check that normal operations work in multi-profile setting as well. |
676 set_test_case_name("keyboardCopyDownloads"); | 676 set_test_case_name("keyboardCopyDownloads"); |
677 StartTest(); | 677 StartTest(); |
678 } | 678 } |
679 | 679 |
| 680 // Flaky: crbug.com/715961. |
| 681 // Previously it was disabled via DISABLE_SLOW_FILESAPP_TESTS and in |
| 682 // OFFICIAL_BUILD, see http://crbug.com/429294. |
| 683 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, |
| 684 DISABLED_PRE_BasicDrive) { |
| 685 AddAllUsers(); |
| 686 } |
| 687 |
680 // Fails on official build. http://crbug.com/429294 | 688 // Fails on official build. http://crbug.com/429294 |
681 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) | 689 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) |
682 #define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive | |
683 #define MAYBE_BasicDrive DISABLED_BasicDrive | 690 #define MAYBE_BasicDrive DISABLED_BasicDrive |
684 #else | 691 #else |
685 #define MAYBE_PRE_BasicDrive PRE_BasicDrive | |
686 #define MAYBE_BasicDrive BasicDrive | 692 #define MAYBE_BasicDrive BasicDrive |
687 #endif | 693 #endif |
688 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, | |
689 MAYBE_PRE_BasicDrive) { | |
690 AddAllUsers(); | |
691 } | |
692 | |
693 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { | 694 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { |
694 AddAllUsers(); | 695 AddAllUsers(); |
695 | 696 |
696 // Sanity check that normal operations work in multi-profile setting as well. | 697 // Sanity check that normal operations work in multi-profile setting as well. |
697 set_test_case_name("keyboardCopyDrive"); | 698 set_test_case_name("keyboardCopyDrive"); |
698 StartTest(); | 699 StartTest(); |
699 } | 700 } |
700 | 701 |
701 } // namespace file_manager | 702 } // namespace file_manager |
OLD | NEW |