Reland 251352 "cros: Enable multiprofile for everyone."

chrome/browser/chromeos/login/user_adding_screen_browsertest.cc

 // Copyright 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.
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/chromeos_switches.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace testing;
 
 namespace {
 
 const char* kTestUsers[] = {"test-user1@gmail.com",
                             "test-user2@gmail.com",
                             "test-user3@gmail.com"};
 
 }  // anonymous namespace
 
 namespace chromeos {
 
 class UserAddingScreenTest : public LoginManagerTest,
                              public UserAddingScreen::Observer {
  public:
   UserAddingScreenTest() : LoginManagerTest(false),
                            user_adding_started_(0),
                            user_adding_finished_(0) {
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(::switches::kMultiProfiles);
-    command_line->AppendSwitch(switches::kForceMultiProfileInTests);
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     LoginManagerTest::SetUpInProcessBrowserTestFixture();
     UserAddingScreen::Get()->AddObserver(this);
   }
 
   virtual void OnUserAddingFinished() OVERRIDE { ++user_adding_finished_; }
 
   virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; }
@@ skipping 123 matching lines @@
   // not be listed on screen lock.
   prefs3->SetString(prefs::kMultiProfileUserBehavior,
                     MultiProfileUserController::kBehaviorNotAllowed);
   unlock_users = user_manager->GetUnlockUsers();
   ASSERT_EQ(2UL, unlock_users.size());
   for (int i = 0; i < 2; ++i)
     EXPECT_EQ(kTestUsers[i], unlock_users[i]->email());
 }
 
 }  // namespace chromeos