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

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

Issue 167173002: Revert 251352 "cros: Enable multiprofile for everyone." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/multi_profile_user_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 {"charlie@invalid.domain", "hashcharlie", "Charlie"}, 825 {"charlie@invalid.domain", "hashcharlie", "Charlie"},
826 }; 826 };
827 827
828 // Test fixture class for testing multi-profile features. 828 // Test fixture class for testing multi-profile features.
829 class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { 829 class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
830 protected: 830 protected:
831 // Enables multi-profiles. 831 // Enables multi-profiles.
832 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 832 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
833 FileManagerBrowserTestBase::SetUpCommandLine(command_line); 833 FileManagerBrowserTestBase::SetUpCommandLine(command_line);
834 command_line->AppendSwitch(switches::kMultiProfiles); 834 command_line->AppendSwitch(switches::kMultiProfiles);
835 command_line->AppendSwitch(chromeos::switches::kForceMultiProfileInTests);
835 // Logs in to a dummy profile (For making MultiProfileWindowManager happy; 836 // Logs in to a dummy profile (For making MultiProfileWindowManager happy;
836 // browser test creates a default window and the manager tries to assign a 837 // browser test creates a default window and the manager tries to assign a
837 // user for it, and we need a profile connected to a user.) 838 // user for it, and we need a profile connected to a user.)
838 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, 839 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
839 kTestAccounts[DUMMY_ACCOUNT_INDEX].email); 840 kTestAccounts[DUMMY_ACCOUNT_INDEX].email);
840 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, 841 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
841 kTestAccounts[DUMMY_ACCOUNT_INDEX].hash); 842 kTestAccounts[DUMMY_ACCOUNT_INDEX].hash);
842 } 843 }
843 844
844 // Logs in to the primary profile of this test. 845 // Logs in to the primary profile of this test.
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 // (bob and charlie) are added in the test. Thus the existing test verifies 989 // (bob and charlie) are added in the test. Thus the existing test verifies
989 // that the feature is effectively working with lastly logged in users. 990 // that the feature is effectively working with lastly logged in users.
990 AddExtraUsersForStressTesting(); 991 AddExtraUsersForStressTesting();
991 992
992 set_test_case_name("multiProfileVisitDesktopMenu"); 993 set_test_case_name("multiProfileVisitDesktopMenu");
993 StartTest(); 994 StartTest();
994 } 995 }
995 996
996 } // namespace 997 } // namespace
997 } // namespace file_manager 998 } // namespace file_manager
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/multi_profile_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698