Turning on MultiProfile by default for ChromeOS

chrome/browser/chromeos/login/login_utils_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/login_utils.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_unit_test_suite.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/mock_async_method_caller.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/disks/mock_disk_mount_manager.h"
@@ skipping 149 matching lines @@
     // will be executed.
     io_thread_.reset(
         new content::TestBrowserThread(BrowserThread::IO, fake_io_loop));
 
     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
 
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(
         policy::switches::kDeviceManagementUrl, kDMServer);
 
-    if (!command_line->HasSwitch(::switches::kMultiProfiles))
-      command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
-
     // DBusThreadManager should be initialized before io_thread_state_, as
     // DBusThreadManager is used from chromeos::ProxyConfigServiceImpl,
     // which is part of io_thread_state_.
     DBusThreadManager::InitializeWithStub();
 
     SystemSaltGetter::Initialize();
     LoginState::Initialize();
 
     EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, _))
         .WillRepeatedly(Return(false));
@@ skipping 296 matching lines @@
 
  private:
   base::ScopedTempDir scoped_temp_dir_;
 
   std::string device_policy_;
   std::string user_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsTest);
 };
 
-class LoginUtilsParamTest
-    : public LoginUtilsTest,
-      public testing::WithParamInterface<bool> {
- public:
-  LoginUtilsParamTest() {}
-
-  virtual void SetUp() OVERRIDE {
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (GetParam())
-      command_line->AppendSwitch(::switches::kMultiProfiles);
-    LoginUtilsTest::SetUp();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LoginUtilsParamTest);
-};
-
 class LoginUtilsBlockingLoginTest
     : public LoginUtilsTest,
       public testing::WithParamInterface<int> {};
 
-TEST_P(LoginUtilsParamTest, NormalLoginDoesntBlock) {
+TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) {
   UserManager* user_manager = UserManager::Get();
   EXPECT_FALSE(user_manager->IsUserLoggedIn());
   EXPECT_FALSE(connector_->IsEnterpriseManaged());
   EXPECT_FALSE(prepared_profile_);
   EXPECT_EQ(policy::USER_AFFILIATION_NONE,
             connector_->GetUserAffiliation(kUsername));
 
   // The profile will be created without waiting for a policy response.
   PrepareProfile(kUsername);
 
   EXPECT_TRUE(prepared_profile_);
   ASSERT_TRUE(user_manager->IsUserLoggedIn());
   EXPECT_EQ(kUsername, user_manager->GetLoggedInUser()->email());
 }
 
-TEST_P(LoginUtilsParamTest, EnterpriseLoginDoesntBlockForNormalUser) {
+TEST_F(LoginUtilsTest, EnterpriseLoginDoesntBlockForNormalUser) {
   UserManager* user_manager = UserManager::Get();
   EXPECT_FALSE(user_manager->IsUserLoggedIn());
   EXPECT_FALSE(connector_->IsEnterpriseManaged());
   EXPECT_FALSE(prepared_profile_);
 
   // Enroll the device.
   EnrollDevice(kUsername);
 
   EXPECT_FALSE(user_manager->IsUserLoggedIn());
   EXPECT_TRUE(connector_->IsEnterpriseManaged());
   EXPECT_EQ(kDomain, connector_->GetEnterpriseDomain());
   EXPECT_FALSE(prepared_profile_);
   EXPECT_EQ(policy::USER_AFFILIATION_NONE,
             connector_->GetUserAffiliation(kUsernameOtherDomain));
 
   // Login with a non-enterprise user shouldn't block.
   PrepareProfile(kUsernameOtherDomain);
 
   EXPECT_TRUE(prepared_profile_);
   ASSERT_TRUE(user_manager->IsUserLoggedIn());
   EXPECT_EQ(kUsernameOtherDomain, user_manager->GetLoggedInUser()->email());
 }
 
 #if defined(ENABLE_RLZ)
-TEST_P(LoginUtilsParamTest, RlzInitialized) {
+TEST_F(LoginUtilsTest, RlzInitialized) {
   // No RLZ brand code set initially.
   EXPECT_FALSE(local_state_.Get()->HasPrefPath(prefs::kRLZBrand));
 
   base::RunLoop wait_for_rlz_init;
   rlz_initialized_cb_ = wait_for_rlz_init.QuitClosure();
 
   PrepareProfile(kUsername);
 
   wait_for_rlz_init.Run();
   // Wait for blocking RLZ tasks to complete.
@@ skipping 114 matching lines @@
 
   // The profile is finally ready:
   EXPECT_TRUE(prepared_profile_);
 }
 
 INSTANTIATE_TEST_CASE_P(
     LoginUtilsBlockingLoginTestInstance,
     LoginUtilsBlockingLoginTest,
     testing::Values(0, 1, 2, 3, 4, 5));
 
-INSTANTIATE_TEST_CASE_P(LoginUtilsParamTestInstantiation,
-                        LoginUtilsParamTest,
-                        testing::Bool());
-
 }  // namespace
 
 }  // namespace chromeos