Enable lock even when no password hash is present.

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

Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
index 0c7e58610e07d5a561fb4a1d387e553bc4e4c6fe..6751783ca658398053b08936ae5ec590a8e63ace 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -459,69 +459,3 @@ TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
   EXPECT_EQ(@selector(hideAccountManagement:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 }
-
-TEST_F(ProfileChooserControllerTest, SignedInProfileLockDisabled) {

[msw, 2014/09/08 19:20:43]

Does it make sense to leave these tests intact, and adjust their expectations to
the button being enabled? Or is that behavior sufficiently covered in other
tests, where the lack of local auth credentials is a trivial difference not
worth explicitly testing?

[Mike Lerman, 2014/09/09 16:47:53]

It's covered above. Line 381-5 within AccountManagementLayout verifies that the
Lock button is present and where it's supposed to be in the menu. These tests
were present only to explicitly test the Enabled/Disabled state.

-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
-  // Sign in the first profile.
-  ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
-  cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
-  cache->SetLocalAuthCredentialsOfProfileAtIndex(0, std::string());
-
-  StartProfileChooserController();
-  NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
-  subviews = [[subviews objectAtIndex:0] subviews];
-
-  // Three profiles means we should have one active card, one separator, one
-  // option buttons view and a lock view. We also have an update promo for the
-  // new avatar menu.
-  // TODO(noms): Enforcing 5U fails on the waterfall debug bots, but it's not
-  // reproducible anywhere else.
-  ASSERT_GE([subviews count], 4U);
-
-  // There will be three buttons and two separators in the option buttons view.
-  NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
-  ASSERT_EQ(5U, [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_FALSE([lockButton isEnabled]);
-}
-
-TEST_F(ProfileChooserControllerTest, SignedInProfileLockEnabled) {
-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
-  // Sign in the first profile.
-  ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
-  cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
-  cache->SetLocalAuthCredentialsOfProfileAtIndex(0, "YourHashHere");
-
-  StartProfileChooserController();
-  NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
-  subviews = [[subviews objectAtIndex:0] subviews];
-
-  // Three profiles means we should have one active card, one separator, one
-  // option buttons view and a lock view. We also have an update promo for the
-  // new avatar menu.
-  // TODO(noms): Enforcing 5U fails on the waterfall debug bots, but it's not
-  // reproducible anywhere else.
-  ASSERT_GE([subviews count], 4U);
-
-  // There will be three buttons and two separators in the option buttons view.
-  NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
-  ASSERT_EQ(5U, [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]);
-}