diff options
Diffstat (limited to 'chrome/browser/ui')
7 files changed, 0 insertions, 65 deletions
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); |