Multi-profile flag cleanup.

chrome/browser/ui/browser_command_controller_unittest.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/ui/browser_command_controller.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/command_updater.h"
@@ skipping 154 matching lines @@
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
 
   // Enabled for app windows.
   browser()->app_name_ = "app";
   ASSERT_TRUE(browser()->is_app());
   browser()->command_controller()->FullscreenStateChanged();
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
 }
 
 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;
 
   EXPECT_FALSE(switches::IsNewProfileManagement());
 
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
   ASSERT_TRUE(testing_profile_manager.SetUp());
   ProfileManager* profile_manager = testing_profile_manager.profile_manager();
 
@@ skipping 15 matching lines @@
   EXPECT_EQ(enabled, command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 
   testing_profile_manager.DeleteTestingProfile("p1");
   ASSERT_EQ(1U, profile_manager->GetNumberOfProfiles());
   EXPECT_EQ(enabled, command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 
   testing_profile_manager.DeleteTestingProfile("p2");
 }
 
 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;
 
   // The command line is reset at the end of every test by the test suite.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kNewProfileManagement);
   EXPECT_TRUE(switches::IsNewProfileManagement());
 
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
   ASSERT_TRUE(testing_profile_manager.SetUp());
   ProfileManager* profile_manager = testing_profile_manager.profile_manager();
 
   chrome::BrowserCommandController command_controller(browser());
   const CommandUpdater* command_updater = command_controller.command_updater();
 
   testing_profile_manager.CreateTestingProfile("p1");
   ASSERT_EQ(1U, profile_manager->GetNumberOfProfiles());
 #if defined(OS_CHROMEOS)
   // Chrome OS uses system tray menu to handle multi-profiles.
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 #else
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 #endif
   testing_profile_manager.DeleteTestingProfile("p1");
 }
 
 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;
 
   // The command line is reset at the end of every test by the test suite.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kNewProfileManagement);
   EXPECT_TRUE(switches::IsNewProfileManagement());
 
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
@@ skipping 17 matching lines @@
   const CommandUpdater* command_updater = command_controller.command_updater();
 #if defined(OS_CHROMEOS)
   // Chrome OS uses system tray menu to handle multi-profiles.
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 #else
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 #endif
 }
 
 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;
 
   // Set up a profile with an off the record profile.
   TestingProfile::Builder normal_builder;
   scoped_ptr<TestingProfile> original_profile = normal_builder.Build();
 
   // Create a new browser based on the off the record profile.
   Browser::CreateParams profile_params(
       original_profile->GetOffTheRecordProfile(), chrome::GetActiveDesktop());
@@ skipping 174 matching lines @@
 
 TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) {
   chrome::BrowserCommandController command_controller(browser());
   const CommandUpdater* command_updater = command_controller.command_updater();
 
   // Check that the SYNC_SETUP command is updated on preference change.
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
   profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
 }