diff options
28 files changed, 93 insertions, 278 deletions
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc index 917c715..4b54e8f 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/login/users/fake_user_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" -#include "chrome/common/chrome_switches.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -208,7 +207,6 @@ class WallpaperPrivateApiMultiUserUnittest }; void WallpaperPrivateApiMultiUserUnittest::SetUp() { - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); AshTestBase::SetUp(); session_state_delegate_ = static_cast<ash::test::TestSessionStateDelegate*> ( diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 4d34c76..771d0b9 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -904,7 +904,6 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { // Enables multi-profiles. virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { FileManagerBrowserTestBase::SetUpCommandLine(command_line); - command_line->AppendSwitch(switches::kMultiProfiles); // 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.) diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc index c668e04..a37442c 100644 --- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc +++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc @@ -10,7 +10,6 @@ #include "base/run_loop.h" #include "chrome/browser/chromeos/login/users/user.h" #include "chrome/browser/chromeos/login/users/user_manager.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/cryptohome_client.h" @@ -38,7 +37,6 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest { virtual ~CrashRestoreSimpleTest() {} virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - command_line->AppendSwitch(::switches::kMultiProfiles); command_line->AppendSwitchASCII(switches::kLoginUser, kUserId1); command_line->AppendSwitchASCII( switches::kLoginProfile, diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index cd9b34c..b0ff5b8 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -31,7 +31,6 @@ #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/chromeos/settings/cros_settings.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" @@ -82,8 +81,7 @@ ACTION_P2(CreateAuthenticator, username, password) { } // namespace -class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest, - public testing::WithParamInterface<bool> { +class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest { protected: ExistingUserControllerTest() : mock_login_display_(NULL), mock_user_manager_(NULL) {} @@ -129,8 +127,6 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest, virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kLoginManager); - if (GetParam()) - command_line->AppendSwitch(::switches::kMultiProfiles); } virtual void SetUpUserManager() { @@ -235,7 +231,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest, DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerTest); }; -IN_PROC_BROWSER_TEST_P(ExistingUserControllerTest, ExistingUserLogin) { +IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) { // This is disabled twice: once right after signin but before checking for // auto-enrollment, and again after doing an ownership status check. EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)) @@ -270,7 +266,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerTest, ExistingUserLogin) { content::RunAllPendingInMessageLoop(); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerTest, AutoEnrollAfterSignIn) { +IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, AutoEnrollAfterSignIn) { EXPECT_CALL(*mock_login_display_host_, StartWizardPtr(WizardController::kEnrollmentScreenName, _)) @@ -298,7 +294,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerTest, AutoEnrollAfterSignIn) { content::RunAllPendingInMessageLoop(); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, NewUserDontAutoEnrollAfterSignIn) { EXPECT_CALL(*mock_login_display_host_, StartWizardPtr(WizardController::kEnrollmentScreenName, @@ -526,7 +522,7 @@ class ExistingUserControllerPublicSessionTest DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerPublicSessionTest); }; -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, ConfigureAutoLoginUsingPolicy) { existing_user_controller()->OnSigninScreenReady(); EXPECT_EQ("", auto_login_username()); @@ -548,7 +544,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, EXPECT_FALSE(auto_login_timer()->IsRunning()); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, AutoLoginNoDelay) { // Set up mocks to check login success. ExpectSuccessfulLogin(public_session_user_id_, ""); @@ -559,7 +555,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, content::RunAllPendingInMessageLoop(); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, AutoLoginShortDelay) { // Set up mocks to check login success. ExpectSuccessfulLogin(public_session_user_id_, ""); @@ -582,7 +578,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, content::RunAllPendingInMessageLoop(); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, LoginStopsAutoLogin) { // Set up mocks to check login success. ExpectSuccessfulLogin(kUsername, kPassword); @@ -607,7 +603,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, EXPECT_FALSE(auto_login_timer()->IsRunning()); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, GuestModeLoginStopsAutoLogin) { EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)) .Times(1); @@ -635,7 +631,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, EXPECT_FALSE(auto_login_timer()->IsRunning()); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, CompleteLoginStopsAutoLogin) { // Set up mocks to check login success. ExpectSuccessfulLogin(kUsername, kPassword); @@ -661,7 +657,7 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, EXPECT_FALSE(auto_login_timer()->IsRunning()); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, PublicSessionLoginStopsAutoLogin) { // Set up mocks to check login success. ExpectSuccessfulLogin(public_session_user_id_, ""); @@ -683,22 +679,14 @@ IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, EXPECT_FALSE(auto_login_timer()->IsRunning()); } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, PRE_TestLoadingPublicUsersFromLocalState) { // First run propagates public accounts and stores them in Local State. } -IN_PROC_BROWSER_TEST_P(ExistingUserControllerPublicSessionTest, +IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, TestLoadingPublicUsersFromLocalState) { // Second run loads list of public accounts from Local State. } -INSTANTIATE_TEST_CASE_P(ExistingUserControllerTestInstantiation, - ExistingUserControllerTest, - testing::Bool()); - -INSTANTIATE_TEST_CASE_P(ExistingUserControllerPublicSessionTestInstantiation, - ExistingUserControllerPublicSessionTest, - testing::Bool()); - } // namespace chromeos diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index 13f35d1..d0d4c5a 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -38,7 +38,6 @@ #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/cryptohome_client.h" @@ -870,8 +869,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAfter2ndSigninScreen) { content::NotificationService::AllSources()).Wait(); } -class KioskUpdateTest : public KioskTest, - public testing::WithParamInterface<bool> { +class KioskUpdateTest : public KioskTest { public: KioskUpdateTest() {} virtual ~KioskUpdateTest() {} @@ -880,10 +878,7 @@ class KioskUpdateTest : public KioskTest, virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { // Needs background networking so that ExtensionDownloader works. needs_background_networking_ = true; - KioskTest::SetUpCommandLine(command_line); - if (GetParam()) - command_line->AppendSwitch(::switches::kMultiProfiles); } virtual void SetUpOnMainThread() OVERRIDE { @@ -895,7 +890,7 @@ class KioskUpdateTest : public KioskTest, DISALLOW_COPY_AND_ASSIGN(KioskUpdateTest); }; -IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppNoNetwork) { +IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppNoNetwork) { set_test_app_id(kTestOfflineEnabledKioskApp); PrepareAppLaunch(); @@ -906,7 +901,7 @@ IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppNoNetwork) { WaitForAppLaunchSuccess(); } -IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppNoUpdate) { +IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppNoUpdate) { set_test_app_id(kTestOfflineEnabledKioskApp); fake_cws()->SetNoUpdate(test_app_id()); @@ -921,7 +916,7 @@ IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppNoUpdate) { EXPECT_EQ("1.0.0", GetInstalledAppVersion().GetString()); } -IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppHasUpdate) { +IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppHasUpdate) { set_test_app_id(kTestOfflineEnabledKioskApp); fake_cws()->SetUpdateCrx( @@ -937,7 +932,7 @@ IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppHasUpdate) { EXPECT_EQ("2.0.0", GetInstalledAppVersion().GetString()); } -IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PermissionChange) { +IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PermissionChange) { set_test_app_id(kTestOfflineEnabledKioskApp); fake_cws()->SetUpdateCrx( @@ -955,7 +950,7 @@ IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PermissionChange) { EXPECT_EQ("2.0.0", GetInstalledAppVersion().GetString()); } -IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_PreserveLocalData) { +IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_PreserveLocalData) { // Installs v1 app and writes some local data. set_test_app_id(kTestLocalFsKioskApp); @@ -965,7 +960,7 @@ IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_PreserveLocalData) { ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); } -IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PreserveLocalData) { +IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PreserveLocalData) { // Update existing v1 app installed in PRE_PreserveLocalData to v2 // that reads and verifies the local data. set_test_app_id(kTestLocalFsKioskApp); @@ -983,11 +978,6 @@ IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PreserveLocalData) { ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); } -// TODO(xiyuan): Remove this after multi profile is turned on by default. -INSTANTIATE_TEST_CASE_P(KioskUpdateTestInstantiation, - KioskUpdateTest, - testing::Bool()); - class KioskEnterpriseTest : public KioskTest { protected: KioskEnterpriseTest() {} diff --git a/chrome/browser/chromeos/login/login_manager_test.cc b/chrome/browser/chromeos/login/login_manager_test.cc index 3066bed..c9eb1bf 100644 --- a/chrome/browser/chromeos/login/login_manager_test.cc +++ b/chrome/browser/chromeos/login/login_manager_test.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/login/ui/webui_login_view.h" #include "chrome/browser/chromeos/login/users/user.h" #include "chrome/browser/chromeos/login/users/user_manager.h" -#include "chrome/common/chrome_switches.h" #include "chromeos/chromeos_switches.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" @@ -38,7 +37,6 @@ void LoginManagerTest::CleanUpOnMainThread() { void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); - command_line->AppendSwitch(::switches::kMultiProfiles); } void LoginManagerTest::SetUpInProcessBrowserTestFixture() { diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc index e838acc..fc16589 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chromeos/login/ui/webui_login_view.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" #include "chrome/browser/chromeos/login/users/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 "content/public/test/test_utils.h" @@ -41,11 +40,6 @@ class UserAddingScreenTest : public LoginManagerTest, user_adding_finished_(0) { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - LoginManagerTest::SetUpCommandLine(command_line); - command_line->AppendSwitch(::switches::kMultiProfiles); - } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { LoginManagerTest::SetUpInProcessBrowserTestFixture(); UserAddingScreen::Get()->AddObserver(this); diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc index 90fb1c9..2de237b 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc @@ -28,7 +28,6 @@ #include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_browser_process.h" #include "chromeos/chromeos_switches.h" @@ -56,8 +55,7 @@ const char kTestUser2Hash[] = "test2@domain.com-hash"; } // namespace -class WallpaperManagerBrowserTest : public InProcessBrowserTest, - public testing::WithParamInterface<bool> { +class WallpaperManagerBrowserTest : public InProcessBrowserTest { public: WallpaperManagerBrowserTest () : controller_(NULL), local_state_(NULL) { @@ -76,8 +74,6 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest, virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); - if (GetParam()) - command_line->AppendSwitch(::switches::kMultiProfiles); } virtual void CleanUpOnMainThread() OVERRIDE { @@ -151,7 +147,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest, // Tests that the appropriate custom wallpaper (large vs. small) is loaded // depending on the desktop resolution. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LoadCustomLargeWallpaperForLargeExternalScreen) { WallpaperManager* wallpaper_manager = WallpaperManager::Get(); LogIn(kTestUser1, kTestUser1Hash); @@ -233,7 +229,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, // If chrome tries to reload the same wallpaper twice, the latter request should // be prevented. Otherwise, there are some strange animation issues as // described in crbug.com/158383. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, PreventReloadingSameWallpaper) { WallpaperManager* wallpaper_manager = WallpaperManager::Get(); // New user log in, a default wallpaper is loaded. @@ -290,7 +286,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, // lagacy wallpapers should migrate to new wallpaper picker version seamlessly. // This tests make sure we compatible with migrated old wallpapers. // crosbug.com/38429 -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, PRE_UseMigratedWallpaperInfo) { // New user log in, a default wallpaper is loaded. LogIn(kTestUser1, kTestUser1Hash); @@ -313,7 +309,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, UseMigratedWallpaperInfo) { LogIn(kTestUser1, kTestUser1Hash); wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); @@ -324,7 +320,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, // Some users have old user profiles which may never get a chance to migrate. // This tests make sure we compatible with these profiles. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, PRE_UsePreMigrationWallpaperInfo) { // New user log in, a default wallpaper is loaded. LogIn(kTestUser1, kTestUser1Hash); @@ -334,7 +330,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, WallpaperManager::Get()->RemoveUserWallpaperInfo(kTestUser1); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, UsePreMigrationWallpaperInfo) { LogIn(kTestUser1, kTestUser1Hash); wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); @@ -344,7 +340,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, // Test for http://crbug.com/265689. When hooked up a large external monitor, // the default large resolution wallpaper should load. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, HotPlugInScreenAtGAIALoginScreen) { UpdateDisplay("800x600"); // Set initial wallpaper to the default wallpaper. @@ -370,7 +366,7 @@ class WallpaperManagerBrowserTestNoAnimation // Same test as WallpaperManagerBrowserTest.UseMigratedWallpaperInfo. But // disabled boot and login animation. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestNoAnimation, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, PRE_UseMigratedWallpaperInfo) { // New user log in, a default wallpaper is loaded. LogIn(kTestUser1, kTestUser1Hash); @@ -393,7 +389,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestNoAnimation, WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestNoAnimation, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, UseMigratedWallpaperInfo) { LogIn(kTestUser1, kTestUser1Hash); wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); @@ -404,7 +400,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestNoAnimation, // Same test as WallpaperManagerBrowserTest.UsePreMigrationWallpaperInfo. But // disabled boot and login animation. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestNoAnimation, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, PRE_UsePreMigrationWallpaperInfo) { // New user log in, a default wallpaper is loaded. LogIn(kTestUser1, kTestUser1Hash); @@ -415,7 +411,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestNoAnimation, WallpaperManager::Get()->RemoveUserWallpaperInfo(kTestUser1); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestNoAnimation, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, UsePreMigrationWallpaperInfo) { LogIn(kTestUser1, kTestUser1Hash); wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); @@ -429,13 +425,12 @@ class WallpaperManagerBrowserTestCrashRestore virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations); command_line->AppendSwitch(chromeos::switches::kDisableBootAnimation); - command_line->AppendSwitch(::switches::kMultiProfiles); command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1); command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); } }; -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestCrashRestore, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore, PRE_RestoreWallpaper) { LogIn(kTestUser1, kTestUser1Hash); wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); @@ -443,7 +438,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestCrashRestore, // Test for crbug.com/270278. It simulates a browser crash and verifies if user // wallpaper is loaded. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestCrashRestore, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore, RestoreWallpaper) { EXPECT_EQ(1, LoadedWallpapers()); } @@ -452,7 +447,6 @@ class WallpaperManagerBrowserTestCacheUpdate : public WallpaperManagerBrowserTest { public: virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - command_line->AppendSwitch(::switches::kMultiProfiles); command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1); command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); } @@ -464,7 +458,7 @@ class WallpaperManagerBrowserTestCacheUpdate }; // Sets kTestUser1's wallpaper to a custom wallpaper. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestCacheUpdate, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCacheUpdate, PRE_VerifyWallpaperCache) { // Add kTestUser1 to user list. kTestUser1 is the default login profile. LogIn(kTestUser1, kTestUser1Hash); @@ -520,7 +514,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestCacheUpdate, // 3. reverts to a default wallpaper. // Also, when user login at multi-profile mode, previous logged in users' // wallpaper cache should not be deleted. -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestCacheUpdate, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCacheUpdate, VerifyWallpaperCache) { WallpaperManager* wallpaper_manager = WallpaperManager::Get(); @@ -571,22 +565,6 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTestCacheUpdate, EXPECT_FALSE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper)); } -INSTANTIATE_TEST_CASE_P(WallpaperManagerBrowserTestInstantiation, - WallpaperManagerBrowserTest, - testing::Bool()); - -INSTANTIATE_TEST_CASE_P(WallpaperManagerBrowserTestNoAnimationInstantiation, - WallpaperManagerBrowserTestNoAnimation, - testing::Bool()); - -INSTANTIATE_TEST_CASE_P(WallpaperManagerBrowserTestCrashRestoreInstantiation, - WallpaperManagerBrowserTestCrashRestore, - testing::Bool()); - -INSTANTIATE_TEST_CASE_P(WallpaperManagerBrowserTestCacheUpdateInstantiation, - WallpaperManagerBrowserTestCacheUpdate, - testing::Bool()); - // ---------------------------------------------------------------------- // Test default wallpapers. @@ -622,7 +600,7 @@ class TestObserver : public WallpaperManager::Observer { DISALLOW_COPY_AND_ASSIGN(TestObserver); }; -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) { +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, DisplayChange) { // TODO(derat|oshima|bshe): Host windows can't be resized on Win8. if (!ash::test::AshTestHelper::SupportsHostWindowResize()) return; @@ -723,7 +701,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, DisplayChange) { // images as specified via command-line flags in various situations. // Splitting these into separate tests avoids needing to run animations. // TODO(derat): Combine these into a single test -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, SmallDefaultWallpaper) { +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallDefaultWallpaper) { if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) return; @@ -738,7 +716,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, SmallDefaultWallpaper) { wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, LargeDefaultWallpaper) { +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeDefaultWallpaper) { if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) return; @@ -751,7 +729,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, LargeDefaultWallpaper) { wallpaper_manager_test_utils::kLargeDefaultWallpaperColor)); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeDefaultWallpaperWhenRotated) { if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) return; @@ -765,7 +743,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, wallpaper_manager_test_utils::kLargeDefaultWallpaperColor)); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, SmallGuestWallpaper) { +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallGuestWallpaper) { if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) return; CreateCmdlineWallpapers(); @@ -779,7 +757,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, SmallGuestWallpaper) { wallpaper_manager_test_utils::kSmallGuestWallpaperColor)); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, LargeGuestWallpaper) { +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeGuestWallpaper) { if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) return; @@ -794,7 +772,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, LargeGuestWallpaper) { wallpaper_manager_test_utils::kLargeGuestWallpaperColor)); } -IN_PROC_BROWSER_TEST_P(WallpaperManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SwitchBetweenDefaultAndCustom) { // Start loading the default wallpaper. UpdateDisplay("640x480"); diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc index 0f7dedd3..c2029f0 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc @@ -28,7 +28,6 @@ #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" #include "chromeos/chromeos_paths.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/cryptohome_client.h" @@ -131,8 +130,7 @@ SkColor GetAverageBackgroundColor() { class WallpaperManagerPolicyTest : public LoginManagerTest, - public ash::DesktopBackgroundControllerObserver, - public testing::WithParamInterface<bool> { + public ash::DesktopBackgroundControllerObserver { protected: WallpaperManagerPolicyTest() : LoginManagerTest(true), @@ -182,10 +180,6 @@ class WallpaperManagerPolicyTest // 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 { @@ -277,7 +271,7 @@ class WallpaperManagerPolicyTest 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(); @@ -287,7 +281,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_SetResetClear) { // 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(); @@ -328,14 +322,14 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, SetResetClear) { 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]); @@ -350,7 +344,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, 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. @@ -364,7 +358,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_WallpaperOnLoginScreen) { 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()); @@ -379,12 +373,12 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, WallpaperOnLoginScreen) { 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. @@ -398,7 +392,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_PersistOverLogout) { 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. @@ -406,7 +400,4 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PersistOverLogout) { ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor()); } -INSTANTIATE_TEST_CASE_P(WallpaperManagerPolicyTestInstantiation, - WallpaperManagerPolicyTest, testing::Bool()); - } // namespace chromeos diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc index 25b4405..15c9a109 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc @@ -25,7 +25,6 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.h" #include "chromeos/chromeos_switches.h" #include "chromeos/settings/cros_settings_names.h" @@ -52,7 +51,6 @@ class WallpaperManagerCacheTest : public test::AshTestBase { FakeUserManager* fake_user_manager() { return fake_user_manager_; } virtual void SetUp() OVERRIDE { - CommandLine::ForCurrentProcess()->AppendSwitch(::switches::kMultiProfiles); test::AshTestBase::SetUp(); } diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc index 2a1da8c..6bb458b 100644 --- a/chrome/browser/chromeos/preferences_browsertest.cc +++ b/chrome/browser/chromeos/preferences_browsertest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" #include "chrome/browser/chromeos/system/fake_input_device_settings.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_switches.h" #include "chromeos/ime/fake_ime_keyboard.h" @@ -44,7 +43,6 @@ class PreferencesTest : public LoginManagerTest { virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { LoginManagerTest::SetUpCommandLine(command_line); - command_line->AppendSwitch(::switches::kMultiProfiles); command_line->AppendSwitch(switches::kStubCrosSettings); } diff --git a/chrome/browser/chromeos/profiles/profile_helper_browsertest.cc b/chrome/browser/chromeos/profiles/profile_helper_browsertest.cc index e891fc3..8f17370 100644 --- a/chrome/browser/chromeos/profiles/profile_helper_browsertest.cc +++ b/chrome/browser/chromeos/profiles/profile_helper_browsertest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/chromeos_switches.h" #include "testing/gtest/include/gtest/gtest.h" @@ -23,25 +22,19 @@ static const char kActiveUserHash[] = "01234567890"; // The boolean parameter, retrieved by GetParam(), is true if testing with // multi-profiles enabled. -class ProfileHelperTest : public InProcessBrowserTest, - public testing::WithParamInterface<bool> { +class ProfileHelperTest : public InProcessBrowserTest { public: ProfileHelperTest() { } protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - if (GetParam()) - command_line->AppendSwitch(::switches::kMultiProfiles); - } - void ActiveUserChanged(ProfileHelper* profile_helper, const std::string& hash) { profile_helper->ActiveUserHashChanged(hash); } }; -IN_PROC_BROWSER_TEST_P(ProfileHelperTest, ActiveUserProfileDir) { +IN_PROC_BROWSER_TEST_F(ProfileHelperTest, ActiveUserProfileDir) { ProfileHelper profile_helper; ActiveUserChanged(&profile_helper, kActiveUserHash); base::FilePath profile_dir = profile_helper.GetActiveUserProfileDir(); @@ -51,7 +44,7 @@ IN_PROC_BROWSER_TEST_P(ProfileHelperTest, ActiveUserProfileDir) { EXPECT_EQ(expected_dir, profile_dir.BaseName().value()); } -IN_PROC_BROWSER_TEST_P(ProfileHelperTest, +IN_PROC_BROWSER_TEST_F(ProfileHelperTest, GetProfileDirByLegacyLoginProfileSwitch) { CommandLine::ForCurrentProcess()-> AppendSwitchASCII(chromeos::switches::kLoginProfile, @@ -70,7 +63,7 @@ IN_PROC_BROWSER_TEST_P(ProfileHelperTest, ProfileHelper::GetProfileDirByLegacyLoginProfileSwitch().value()); } -IN_PROC_BROWSER_TEST_P(ProfileHelperTest, GetProfilePathByUserIdHash) { +IN_PROC_BROWSER_TEST_F(ProfileHelperTest, GetProfilePathByUserIdHash) { ProfileHelper profile_helper; base::FilePath profile_path = profile_helper.GetProfilePathByUserIdHash(kActiveUserHash); @@ -80,8 +73,4 @@ IN_PROC_BROWSER_TEST_P(ProfileHelperTest, GetProfilePathByUserIdHash) { EXPECT_EQ(expected_path, profile_path); } -INSTANTIATE_TEST_CASE_P(ProfileHelperTestInstantiation, - ProfileHelperTest, - testing::Bool()); - } // namespace chromeos diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc index 4dc2327..183e146 100644 --- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc +++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc @@ -64,10 +64,6 @@ class ProfileListChromeOSTest : public testing::Test { // AvatarMenu and multiple profiles works after user logged in. manager_.SetLoggedIn(true); - // We only instantiate UserMenuModel if multi-profile mode is enabled. - CommandLine* cl = CommandLine::ForCurrentProcess(); - cl->AppendSwitch(switches::kMultiProfiles); - // Initialize the UserManager singleton to a fresh FakeUserManager instance. user_manager_enabler_.reset( new ScopedUserManagerEnabler(new FakeUserManager)); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc index bb316d6..86f5492 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/chromeos/login/users/user.h" #include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "extensions/common/switches.h" #include "testing/gmock/include/gmock/gmock.h" @@ -133,8 +132,7 @@ class CryptoVerifyStub #endif // defined(OS_CHROMEOS) class ExtensionNetworkingPrivateApiTest - : public ExtensionApiTest, - public testing::WithParamInterface<bool> { + : public ExtensionApiTest { public: ExtensionNetworkingPrivateApiTest() #if defined(OS_CHROMEOS) @@ -184,8 +182,6 @@ class ExtensionNetworkingPrivateApiTest CryptohomeClient::GetStubSanitizedUsername(login_user); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, sanitized_user); - if (GetParam()) - command_line->AppendSwitch(::switches::kMultiProfiles); } void InitializeSanitizedUsername() { @@ -372,25 +368,25 @@ class ExtensionNetworkingPrivateApiTest // library state is reset for each subtest run. This way they won't affect each // other. -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, StartConnect) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartConnect) { EXPECT_TRUE(RunNetworkingSubtest("startConnect")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, StartDisconnect) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartDisconnect) { EXPECT_TRUE(RunNetworkingSubtest("startDisconnect")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartConnectNonexistent) { EXPECT_TRUE(RunNetworkingSubtest("startConnectNonexistent")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartDisconnectNonexistent) { EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartGetPropertiesNonexistent) { EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent")) << message_; @@ -398,7 +394,7 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, #if defined(OS_CHROMEOS) // TODO(stevenjb/mef): Fix these on non-Chrome OS, crbug.com/371442. -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetNetworks) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetNetworks) { // Remove "stub_wifi2" from the visible list. manager_test_->RemoveManagerService("stub_wifi2", false); // Add a couple of additional networks that are not configured (saved). @@ -407,49 +403,49 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetNetworks) { EXPECT_TRUE(RunNetworkingSubtest("getNetworks")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) { EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; } #endif -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetVisibleNetworksWifi) { EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_; } #if defined(OS_CHROMEOS) // TODO(stevenjb/mef): Fix this on non-Chrome OS, crbug.com/371442. -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) { EXPECT_TRUE(RunNetworkingSubtest("requestNetworkScan")) << message_; } #endif // Properties are filtered and translated through // ShillToONCTranslator::TranslateWiFiWithState -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetProperties) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetProperties) { EXPECT_TRUE(RunNetworkingSubtest("getProperties")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetState) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetState) { EXPECT_TRUE(RunNetworkingSubtest("getState")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetStateNonExistent) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetStateNonExistent) { EXPECT_TRUE(RunNetworkingSubtest("getStateNonExistent")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, SetProperties) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, SetProperties) { EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) { +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, CreateNetwork) { EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_; } #if defined(OS_CHROMEOS) // TODO(stevenjb/mef): Find a maintainable way to support this on win/mac and // a better way to set this up on Chrome OS. -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetManagedProperties) { const std::string uidata_blob = "{ \"user_settings\": {" @@ -501,13 +497,13 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, } #endif // OS_CHROMEOS -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, OnNetworksChangedEventConnect) { EXPECT_TRUE(RunNetworkingSubtest("onNetworksChangedEventConnect")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, OnNetworksChangedEventDisconnect) { EXPECT_TRUE(RunNetworkingSubtest("onNetworksChangedEventDisconnect")) << message_; @@ -515,35 +511,35 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, #if defined(OS_CHROMEOS) // TODO(stevenjb/mef): Fix this on non-Chrome OS, crbug.com/371442. -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, OnNetworkListChangedEvent) { EXPECT_TRUE(RunNetworkingSubtest("onNetworkListChangedEvent")) << message_; } #endif // OS_CHROMEOS -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, VerifyDestination) { EXPECT_TRUE(RunNetworkingSubtest("verifyDestination")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, VerifyAndEncryptCredentials) { EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptCredentials")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, VerifyAndEncryptData) { EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; } #if defined(OS_CHROMEOS) // Currently TDLS support is only enabled for Chrome OS. -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, SetWifiTDLSEnabledState) { EXPECT_TRUE(RunNetworkingSubtest("setWifiTDLSEnabledState")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetWifiTDLSStatus) { EXPECT_TRUE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; } @@ -551,7 +547,7 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, // NetworkPortalDetector is only enabled for Chrome OS. #if defined(OS_CHROMEOS) -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetCaptivePortalStatus) { AddService("stub_cellular1", "cellular1", shill::kTypeCellular, shill::kStateIdle); @@ -588,7 +584,7 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, EXPECT_TRUE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; } -IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, +IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, CaptivePortalNotification) { detector()->SetDefaultNetworkPathForTesting("wifi"); NetworkPortalDetector::CaptivePortalState state; @@ -603,8 +599,4 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, } #endif // defined(OS_CHROMEOS) -INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, - ExtensionNetworkingPrivateApiTest, - testing::Bool()); - } // namespace diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc index e5bdb3f..b580844 100644 --- a/chrome/browser/metrics/metrics_log_unittest.cc +++ b/chrome/browser/metrics/metrics_log_unittest.cc @@ -22,7 +22,6 @@ #include "base/tracked_objects.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" @@ -224,9 +223,6 @@ class MetricsLogTest : public testing::Test { protected: virtual void SetUp() OVERRIDE { #if defined(OS_CHROMEOS) - // Enable multi-profiles. - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); - // Set up the fake Bluetooth environment, scoped_ptr<FakeDBusThreadManager> fake_dbus_thread_manager( new FakeDBusThreadManager); diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc index f75629c..451fc7a 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/chromeos/login/startup_utils.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" #include "chrome/browser/notifications/login_state_notification_blocker_chromeos.h" -#include "chrome/common/chrome_switches.h" #include "content/public/test/test_utils.h" #include "ui/message_center/message_center.h" @@ -31,12 +30,6 @@ class LoginStateNotificationBlockerChromeOSBrowserTest state_changed_count_(0) {} virtual ~LoginStateNotificationBlockerChromeOSBrowserTest() {} - // InProcessBrowserTest overrides: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - LoginManagerTest::SetUpCommandLine(command_line); - command_line->AppendSwitch(::switches::kMultiProfiles); - } - virtual void SetUpOnMainThread() OVERRIDE { chromeos::LoginState::Get()->set_always_logged_in(false); chromeos::LoginManagerTest::SetUpOnMainThread(); diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc index 3d9c2a4..0e39ae3 100644 --- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc +++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/test_browser_thread_bundle.h" @@ -71,9 +70,6 @@ class MessageCenterSettingsControllerChromeOSTest virtual void SetUp() OVERRIDE { MessageCenterSettingsControllerTest::SetUp(); - // Enabling multi profile requires several flags to be set. - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); - // Initialize the UserManager singleton to a fresh FakeUserManager instance. user_manager_enabler_.reset( new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager)); diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index debf2a3..1746f90 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -802,6 +802,7 @@ void ProfileManager::Observe( logged_in_ = true; const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + LOG(ERROR) << ">>>>>>>> " << command_line.GetCommandLineString(); if (!command_line.HasSwitch(switches::kTestType)) { // If we don't have a mounted profile directory we're in trouble. // TODO(davemoore) Once we have better api this check should ensure that diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index fb040c1..a0f1660 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -378,8 +378,7 @@ class UnittestGuestProfileManager : public UnittestProfileManager { } }; -class ProfileManagerGuestTest : public ProfileManagerTest, - public testing::WithParamInterface<bool> { +class ProfileManagerGuestTest : public ProfileManagerTest { protected: virtual void SetUp() { // Create a new temporary directory, and store the path @@ -389,17 +388,13 @@ class ProfileManagerGuestTest : public ProfileManagerTest, #if defined(OS_CHROMEOS) CommandLine* cl = CommandLine::ForCurrentProcess(); - if (GetParam()) - cl->AppendSwitch(switches::kMultiProfiles); - + // This switch is needed to skip non-test specific behavior in + // ProfileManager (accessing DBusThreadManager). cl->AppendSwitch(switches::kTestType); - if (profiles::IsMultipleProfilesEnabled()) { - cl->AppendSwitchASCII(chromeos::switches::kLoginProfile, - std::string(chrome::kProfileDirPrefix) + - chromeos::UserManager::kGuestUserName); - } else { - cl->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); - } + + cl->AppendSwitchASCII(chromeos::switches::kLoginProfile, + std::string(chrome::kProfileDirPrefix) + + chromeos::UserManager::kGuestUserName); cl->AppendSwitch(chromeos::switches::kGuestSession); cl->AppendSwitch(::switches::kIncognito); @@ -411,11 +406,7 @@ class ProfileManagerGuestTest : public ProfileManagerTest, } }; -INSTANTIATE_TEST_CASE_P(ProfileManagerGuestTestInstantiation, - ProfileManagerGuestTest, - testing::Bool()); - -TEST_P(ProfileManagerGuestTest, GetLastUsedProfileAllowedByPolicy) { +TEST_F(ProfileManagerGuestTest, GetLastUsedProfileAllowedByPolicy) { ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); @@ -425,7 +416,7 @@ TEST_P(ProfileManagerGuestTest, GetLastUsedProfileAllowedByPolicy) { } #if defined(OS_CHROMEOS) -TEST_P(ProfileManagerGuestTest, GuestProfileIngonito) { +TEST_F(ProfileManagerGuestTest, GuestProfileIngonito) { Profile* primary_profile = ProfileManager::GetPrimaryUserProfile(); EXPECT_TRUE(primary_profile->IsOffTheRecord()); diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index bc6f1da..3afac5c 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -786,9 +786,6 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest // AvatarMenu and multiple profiles works after user logged in. profile_manager_->SetLoggedIn(true); - // Enabling multi profile requires several flags to be set. - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); - // Initialize the UserManager singleton to a fresh FakeUserManager instance. user_manager_enabler_.reset( new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager)); diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc index 2b8f67a..47c3312 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc @@ -54,7 +54,6 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase { }; void MultiUserContextMenuChromeOSTest::SetUp() { - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); AshTestBase::SetUp(); window_ = CreateTestWindowInShellWithId(0); diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc index 8dc3171..f425e0bb 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_profile.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h" @@ -145,7 +144,6 @@ class MultiUserWindowManagerChromeOSTest : public AshTestBase { }; void MultiUserWindowManagerChromeOSTest::SetUp() { - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); AshTestBase::SetUp(); session_state_delegate_ = static_cast<TestSessionStateDelegate*> ( diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc index 1b0eb27..60ac521 100644 --- a/chrome/browser/ui/browser_command_controller_unittest.cc +++ b/chrome/browser/ui/browser_command_controller_unittest.cc @@ -172,12 +172,6 @@ TEST_F(BrowserCommandControllerTest, AppFullScreen) { } TEST_F(BrowserCommandControllerTest, OldAvatarMenuEnabledForOneOrMoreProfiles) { -#if defined(OS_CHROMEOS) - // TODO(nkostylev): Cleanup this code once multi-profiles are enabled by - // default on CrOS. http://crbug.com/351655 - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); -#endif - if (!profiles::IsMultipleProfilesEnabled()) return; @@ -213,12 +207,6 @@ TEST_F(BrowserCommandControllerTest, OldAvatarMenuEnabledForOneOrMoreProfiles) { } TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledWhenOnlyOneProfile) { -#if defined(OS_CHROMEOS) - // TODO(nkostylev): Cleanup this code once multi-profiles are enabled by - // default on CrOS. http://crbug.com/351655 - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); -#endif - if (!profiles::IsMultipleProfilesEnabled()) return; @@ -247,12 +235,6 @@ TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledWhenOnlyOneProfile) { } TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledInGuestMode) { -#if defined(OS_CHROMEOS) - // TODO(nkostylev): Cleanup this code once multi-profiles are enabled by - // default on CrOS. http://crbug.com/351655 - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); -#endif - if (!profiles::IsMultipleProfilesEnabled()) return; @@ -290,12 +272,6 @@ TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledInGuestMode) { } TEST_F(BrowserCommandControllerTest, AvatarMenuAlwaysDisabledInIncognitoMode) { -#if defined(OS_CHROMEOS) - // TODO(nkostylev): Cleanup this code once multi-profiles are enabled by - // default on CrOS. http://crbug.com/351655 - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); -#endif - if (!profiles::IsMultipleProfilesEnabled()) return; diff --git a/chrome/browser/ui/settings_window_manager_browsertest.cc b/chrome/browser/ui/settings_window_manager_browsertest.cc index 83f0cf3..a1f7d27 100644 --- a/chrome/browser/ui/settings_window_manager_browsertest.cc +++ b/chrome/browser/ui/settings_window_manager_browsertest.cc @@ -61,7 +61,6 @@ class SettingsWindowManagerTest : public InProcessBrowserTest { virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(::switches::kEnableSettingsWindow); - command_line->AppendSwitch(::switches::kMultiProfiles); } Profile* CreateTestProfile() { diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc index 50b7d27..64486e8 100644 --- a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc +++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc @@ -18,31 +18,13 @@ #include "chrome/test/base/testing_browser_process.h" #include "components/infobars/core/infobar.h" -#if defined(OS_CHROMEOS) -#include "base/command_line.h" -#include "chrome/common/chrome_switches.h" -#endif - -#if defined(OS_CHROMEOS) -// TODO(nkostylev): Cleanup this code once multi-profiles are enabled by -// default on CrOS. http://crbug.com/351655 -class SessionCrashedInfoBarDelegateUnitTest : - public BrowserWithTestWindowTest, - public testing::WithParamInterface<bool> { -#else class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest { -#endif public: virtual void SetUp() OVERRIDE { static_cast<TestingBrowserProcess*>(g_browser_process) ->SetLocalState(&pref_service); chrome::RegisterLocalState(pref_service.registry()); -#if defined(OS_CHROMEOS) - if (GetParam()) - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); -#endif - // This needs to be called after the local state is set, because it will // create a browser which will try to read from the local state. BrowserWithTestWindowTest::SetUp(); @@ -57,11 +39,7 @@ class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest { TestingPrefServiceSimple pref_service; }; -#if defined(OS_CHROMEOS) -TEST_P(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) { -#else TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) { -#endif SessionServiceFactory::SetForTestProfile( browser()->profile(), static_cast<SessionService*>( @@ -112,9 +90,3 @@ TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) { // Ramp down the test. tab_strip->CloseWebContentsAt(0, TabStripModel::CLOSE_NONE); } - -#if defined(OS_CHROMEOS) -INSTANTIATE_TEST_CASE_P(SessionCrashedInfoBarDelegateUnitTestInstantiation, - SessionCrashedInfoBarDelegateUnitTest, - testing::Bool()); -#endif diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc index ac9841b..f7f74ea 100644 --- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/settings/cros_settings_names.h" @@ -55,11 +54,6 @@ class SharedOptionsTest : public LoginManagerTest { LoginManagerTest::CleanUpOnMainThread(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - LoginManagerTest::SetUpCommandLine(command_line); - command_line->AppendSwitch(::switches::kMultiProfiles); - } - protected: void CheckOptionsUI(const User* user, bool is_primary) { Profile* profile = UserManager::Get()->GetProfileByUser(user); diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 366cf51..1760175 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -890,9 +890,6 @@ const char kMessageLoopHistogrammer[] = "message-loop-histogrammer"; // performance tests. const char kMetricsRecordingOnly[] = "metrics-recording-only"; -// Enables multiprofile Chrome. -const char kMultiProfiles[] = "multi-profiles"; - // Sets the base logging level for the net log. Log 0 logs the most data. // Intended primarily for use with --log-net-log. const char kNetLogLevel[] = "net-log-level"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index a49d899..7dce431 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -249,7 +249,6 @@ extern const char kMediaCacheSize[]; extern const char kMemoryProfiling[]; extern const char kMessageLoopHistogrammer[]; extern const char kMetricsRecordingOnly[]; -extern const char kMultiProfiles[]; extern const char kNetLogLevel[]; extern const char kNoDefaultBrowserCheck[]; extern const char kNoDisplayingInsecureContent[]; |