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

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

Issue 294033002: Multi-profile flag cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Return --test-type flag back to profile_manager_unittest.cc Created 6 years, 7 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
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 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 {"bob@invalid.domain", "hashbob", "Bob"}, 897 {"bob@invalid.domain", "hashbob", "Bob"},
898 {"charlie@invalid.domain", "hashcharlie", "Charlie"}, 898 {"charlie@invalid.domain", "hashcharlie", "Charlie"},
899 }; 899 };
900 900
901 // Test fixture class for testing multi-profile features. 901 // Test fixture class for testing multi-profile features.
902 class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { 902 class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
903 protected: 903 protected:
904 // Enables multi-profiles. 904 // Enables multi-profiles.
905 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 905 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
906 FileManagerBrowserTestBase::SetUpCommandLine(command_line); 906 FileManagerBrowserTestBase::SetUpCommandLine(command_line);
907 command_line->AppendSwitch(switches::kMultiProfiles);
908 // Logs in to a dummy profile (For making MultiProfileWindowManager happy; 907 // Logs in to a dummy profile (For making MultiProfileWindowManager happy;
909 // browser test creates a default window and the manager tries to assign a 908 // browser test creates a default window and the manager tries to assign a
910 // user for it, and we need a profile connected to a user.) 909 // user for it, and we need a profile connected to a user.)
911 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, 910 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
912 kTestAccounts[DUMMY_ACCOUNT_INDEX].email); 911 kTestAccounts[DUMMY_ACCOUNT_INDEX].email);
913 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, 912 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
914 kTestAccounts[DUMMY_ACCOUNT_INDEX].hash); 913 kTestAccounts[DUMMY_ACCOUNT_INDEX].hash);
915 } 914 }
916 915
917 // Logs in to the primary profile of this test. 916 // Logs in to the primary profile of this test.
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 // (bob and charlie) are added in the test. Thus the existing test verifies 1060 // (bob and charlie) are added in the test. Thus the existing test verifies
1062 // that the feature is effectively working with lastly logged in users. 1061 // that the feature is effectively working with lastly logged in users.
1063 AddExtraUsersForStressTesting(); 1062 AddExtraUsersForStressTesting();
1064 1063
1065 set_test_case_name("multiProfileVisitDesktopMenu"); 1064 set_test_case_name("multiProfileVisitDesktopMenu");
1066 StartTest(); 1065 StartTest();
1067 } 1066 }
1068 1067
1069 } // namespace 1068 } // namespace
1070 } // namespace file_manager 1069 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698