Remove IsNewProfileManagement and EnableNewProfileManagementForTesting

chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #import "base/mac/foundation_util.h"
@@ skipping 414 matching lines @@
   EXPECT_TRUE([[subviews objectAtIndex:3] isKindOfClass:[NSBox class]]);
 
   // There should be the profile avatar, name and a "hide accounts" link
   // container in the active card view.
   NSArray* activeCardSubviews = [[subviews objectAtIndex:4] subviews];
   // In the MD user menu, the profile name and avatar are in the same subview.
   ASSERT_EQ(2U, [activeCardSubviews count]);
 }
 
 TEST_F(ProfileChooserControllerTest, SignedInProfileLockDisabled) {
-  switches::EnableNewProfileManagementForTesting(
-      base::CommandLine::ForCurrentProcess());
-
   SignInFirstProfile();
 
   // The preference, not the email, determines whether the profile can lock.
   browser()->profile()->GetPrefs()->SetString(
       prefs::kGoogleServicesHostedDomain, "chromium.org");
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   // There will be two buttons in the option buttons view.
   ASSERT_EQ(2U, [buttonSubviews count]);
 
   // The last button should not be the lock button.
   NSButton* lastButton =
       base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
   ASSERT_TRUE(lastButton);
   EXPECT_NE(@selector(lockProfile:), [lastButton action]);
 }
 
 TEST_F(ProfileChooserControllerTest, SignedInProfileLockEnabled) {
-  switches::EnableNewProfileManagementForTesting(
-      base::CommandLine::ForCurrentProcess());
-
   SignInFirstProfile();
 
   // The preference, not the email, determines whether the profile can lock.
   browser()->profile()->GetPrefs()->SetString(
       prefs::kGoogleServicesHostedDomain, "google.com");
   // Lock is only available where a supervised user is present.
   ProfileAttributesEntry* entry = testing_profile_manager()->
       profile_attributes_storage()->GetAllProfilesAttributes().front();
   entry->SetSupervisedUserId(kEmail);
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   // There will be two buttons and one separator in the option buttons view.
   ASSERT_EQ(3U, [buttonSubviews count]);
 
   // There should be a lock button.
   NSButton* lockButton =
       base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
   ASSERT_TRUE(lockButton);
   EXPECT_EQ(@selector(lockProfile:), [lockButton action]);
   EXPECT_EQ(controller(), [lockButton target]);
   EXPECT_TRUE([lockButton isEnabled]);
 }