Reland 251352 "cros: Enable multiprofile for everyone."

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 814 matching lines @@
   {"charlie@invalid.domain", "hashcharlie", "Charlie"},
 };
 
 // Test fixture class for testing multi-profile features.
 class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
  protected:
   // Enables multi-profiles.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     FileManagerBrowserTestBase::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kMultiProfiles);
-    command_line->AppendSwitch(chromeos::switches::kForceMultiProfileInTests);
     // Logs in to a dummy profile (For making MultiProfileWindowManager happy;
     // browser test creates a default window and the manager tries to assign a
     // user for it, and we need a profile connected to a user.)
     command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
                                     kTestAccounts[DUMMY_ACCOUNT_INDEX].email);
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
                                     kTestAccounts[DUMMY_ACCOUNT_INDEX].hash);
   }
 
   // Logs in to the primary profile of this test.
@@ skipping 143 matching lines @@
   // (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();
 }
 
 }  // namespace
 }  // namespace file_manager