Multi-profile flag cleanup

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"

[Nikita (slow), 2014/05/19 14:27:15]

nit: not used

 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
@@ skipping 82 matching lines @@
   }
 
   const SkBitmap& bitmap = representation.sk_bitmap();
   return ComputeAverageColor(bitmap);
 }
 
 }  // namespace
 
 class WallpaperManagerPolicyTest
     : public LoginManagerTest,
-      public ash::DesktopBackgroundControllerObserver,
-      public testing::WithParamInterface<bool> {
+      public ash::DesktopBackgroundControllerObserver {
  protected:
   WallpaperManagerPolicyTest()
       : LoginManagerTest(true),
         wallpaper_change_count_(0),
         fake_dbus_thread_manager_(new FakeDBusThreadManager),
         fake_session_manager_client_(new FakeSessionManagerClient) {
     fake_dbus_thread_manager_->SetFakeClients();
     fake_dbus_thread_manager_->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
   }
@@ skipping 29 matching lines @@
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Set the same switches as LoginManagerTest, except that kMultiProfiles is
     // only set when GetParam() is true and except that kLoginProfile is set
     // when GetParam() is false.  The latter seems to be required for the sane
     // start-up of user profiles.
     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitch(switches::kForceLoginManagerInTests);
-    if (GetParam())
-      command_line->AppendSwitch(::switches::kMultiProfiles);
-    else
-      command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     LoginManagerTest::SetUpOnMainThread();
     ash::Shell::GetInstance()->
         desktop_background_controller()->AddObserver(this);
 
     // Set up policy signing.
     user_policy_builders_[0] = GetUserPolicyBuilder(kTestUsers[0]);
     user_policy_builders_[1] = GetUserPolicyBuilder(kTestUsers[1]);
@@ skipping 71 matching lines @@
   scoped_ptr<base::RunLoop> run_loop_;
   int wallpaper_change_count_;
   scoped_ptr<policy::UserPolicyBuilder> user_policy_builders_[2];
   FakeDBusThreadManager* fake_dbus_thread_manager_;
   FakeSessionManagerClient* fake_session_manager_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WallpaperManagerPolicyTest);
 };
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_SetResetClear) {
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_SetResetClear) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies that the wallpaper can be set and re-set through policy and that
 // setting policy for a user that is not logged in doesn't affect the current
 // user.  Also verifies that after the policy has been cleared, the wallpaper
 // reverts to default.
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, SetResetClear) {
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, SetResetClear) {
   WallpaperInfo info;
   LoginUser(kTestUsers[0]);
   base::RunLoop().RunUntilIdle();
 
   // First user: Wait until default wallpaper has been loaded (happens
   // automatically) and store color to recognize it later.
   RunUntilWallpaperChangeCount(1);
   const SkColor original_background_color = GetAverageBackgroundColor();
 
   // Second user: Set wallpaper policy to blue image.  This should not result in
@@ skipping 20 matching lines @@
   RunUntilWallpaperChangeCount(4);
   GetUserWallpaperInfo(0, &info);
   ASSERT_EQ(User::DEFAULT, info.type);
   ASSERT_EQ(original_background_color, GetAverageBackgroundColor());
 
   // Check wallpaper change count to ensure that setting the second user's
   // wallpaper didn't have any effect.
   ASSERT_EQ(4, wallpaper_change_count_);
 }
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest,
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        PRE_PRE_PRE_WallpaperOnLoginScreen) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest,
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        PRE_PRE_WallpaperOnLoginScreen) {
   LoginUser(kTestUsers[0]);
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to red image.
   InjectPolicy(0, kRedImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_WallpaperOnLoginScreen) {
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_WallpaperOnLoginScreen) {
   LoginUser(kTestUsers[1]);
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to green image.
   InjectPolicy(1, kGreenImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kGreenImageColor, GetAverageBackgroundColor());
 }
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, WallpaperOnLoginScreen) {
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, WallpaperOnLoginScreen) {
   // Wait for active pod's wallpaper to be loaded.
   RunUntilWallpaperChangeCount(1);
   ASSERT_EQ(kGreenImageColor, GetAverageBackgroundColor());
 
   // Select the second pod (belonging to user 1).
   ASSERT_TRUE(content::ExecuteScript(
       static_cast<chromeos::LoginDisplayHostImpl*>(
           chromeos::LoginDisplayHostImpl::default_host())->GetOobeUI()->
               web_ui()->GetWebContents(),
       "document.getElementsByClassName('pod')[1].focus();"));
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_PRE_PersistOverLogout) {
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_PRE_PersistOverLogout) {
   RegisterUser(kTestUsers[0]);
   StartupUtils::MarkOobeCompleted();
 }
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_PersistOverLogout) {
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_PersistOverLogout) {
   LoginUser(kTestUsers[0]);
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to red image.
   InjectPolicy(0, kRedImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
-IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PersistOverLogout) {
+IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PersistOverLogout) {
   LoginUser(kTestUsers[0]);
 
   // Wait until wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
-INSTANTIATE_TEST_CASE_P(WallpaperManagerPolicyTestInstantiation,
-                        WallpaperManagerPolicyTest, testing::Bool());
-
 }  // namespace chromeos