| 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 1e82825c323c053d62b8113e68a51e38423d9364..4cfbb888e5a271ec2c5297f5ce65a9a40294258f 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| @@ -946,21 +946,6 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
|
| AddUser(kTestAccounts[i], i >= SECONDARY_ACCOUNT_INDEX_START);
|
| }
|
|
|
| - // Add as many as users
|
| - void AddExtraUsersForStressTesting() {
|
| - ash::Shell* const shell = ash::Shell::GetInstance();
|
| - const size_t maxLogin =
|
| - shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers();
|
| -
|
| - for (int i = 0; i + arraysize(kTestAccounts) < maxLogin; ++i) {
|
| - const std::string email = base::StringPrintf("user%d@invalid.domain", i);
|
| - const std::string hash = base::StringPrintf("hashuser%d", i);
|
| - const std::string name = base::StringPrintf("Additional User %d", i);
|
| - const TestAccountInfo info = {email.c_str(), hash.c_str(), name.c_str()};
|
| - AddUser(info, true);
|
| - }
|
| - }
|
| -
|
| // Returns primary profile (if it is already created.)
|
| virtual Profile* profile() OVERRIDE {
|
| Profile* const profile = chromeos::ProfileHelper::GetProfileByUserIdHash(
|
| @@ -1062,26 +1047,6 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, VisitDesktopMenu) {
|
| StartTest();
|
| }
|
|
|
| -// TODO(kinaba): investigate the flakiness.
|
| -IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
|
| - DISABLED_PRE_MaxUser) {
|
| - AddAllUsers();
|
| - AddExtraUsersForStressTesting();
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
|
| - DISABLED_MaxUser) {
|
| - // Run the same test as VisitDesktopMenu with maximum number of users logged
|
| - // in and checks that nothing goes wrong. Here, the primary user (alice) logs
|
| - // in first, then the "extra" users follow, and then lastly the other users
|
| - // (bob and charlie) are added in the test. Thus the existing test verifies
|
| - // that the feature is effectively working with lastly logged in users.
|
| - AddExtraUsersForStressTesting();
|
| -
|
| - set_test_case_name("multiProfileVisitDesktopMenu");
|
| - StartTest();
|
| -}
|
| -
|
| template<GuestMode M>
|
| class GalleryBrowserTestBase : public FileManagerBrowserTestBase {
|
| public:
|
|
|