[Win, Mac] UI fixes for the delete account button in the new avatar bubble.

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 "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 382 matching lines @@
       static_cast<NSButton*>([accountsSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(addAccount:), [addAccountsButton action]);
   EXPECT_EQ(controller(), [addAccountsButton target]);
 
   // There should be two accounts in the account list container.
   NSArray* accountsListSubviews = [[accountsSubviews objectAtIndex:1] subviews];
   EXPECT_EQ(2U, [accountsListSubviews count]);
 
   NSButton* genericAccount =
       static_cast<NSButton*>([accountsListSubviews objectAtIndex:0]);
-  EXPECT_EQ(@selector(showAccountRemovalView:), [genericAccount action]);
-  EXPECT_EQ(controller(), [genericAccount target]);
-  EXPECT_NE(-1, [genericAccount tag]);
+  NSButton* genericAccountDelete =
+      static_cast<NSButton*>([[genericAccount subviews] objectAtIndex:0]);
+  EXPECT_EQ(@selector(showAccountRemovalView:), [genericAccountDelete action]);
+  EXPECT_EQ(controller(), [genericAccountDelete target]);
+  EXPECT_NE(-1, [genericAccountDelete tag]);
 
   // Primary accounts are always last.
   NSButton* primaryAccount =
       static_cast<NSButton*>([accountsListSubviews objectAtIndex:1]);
-  EXPECT_EQ(@selector(showAccountRemovalView:), [primaryAccount action]);
-  EXPECT_EQ(controller(), [primaryAccount target]);
-  EXPECT_EQ(-1, [primaryAccount tag]);
+  NSButton* primaryAccountDelete =
+      static_cast<NSButton*>([[primaryAccount subviews] objectAtIndex:0]);
+  EXPECT_EQ(@selector(showAccountRemovalView:), [primaryAccountDelete action]);
+  EXPECT_EQ(controller(), [primaryAccountDelete target]);
+  EXPECT_EQ(-1, [primaryAccountDelete tag]);
 
   // There should be another separator.
   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];
   EXPECT_EQ(3U, [activeCardSubviews count]);
 
   // Profile icon.
   NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
   EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
 
   // Profile name.
   NSView* activeProfileName = [activeCardSubviews objectAtIndex:1];
   EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [static_cast<NSButton*>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
   EXPECT_EQ(1U, [linksSubviews count]);
   NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(hideAccountManagement:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 }