[rAc OSX] Simplify the overlay controller.

chrome/browser/ui/cocoa/autofill/autofill_overlay_controller_unittest.mm

 // Copyright 2013 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/autofill/autofill_overlay_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 15 matching lines @@
   base::scoped_nsobject<AutofillOverlayController> controller_;
   testing::NiceMock<autofill::MockAutofillDialogViewDelegate> delegate_;
 };
 
 }  // namespace
 
 TEST_VIEW(AutofillOverlayControllerTest, [controller_ view])
 
 TEST_F(AutofillOverlayControllerTest, Subviews) {
   NSView* view = [controller_ view];
-  ASSERT_EQ(1U, [[view subviews] count]);
+  EXPECT_TRUE([view isKindOfClass:[NSBox class]]);
 
-  EXPECT_TRUE([view isKindOfClass:[NSBox class]]);
-  EXPECT_TRUE([[[view subviews] objectAtIndex:0] isMemberOfClass:
-          [NSView class]]);
+  ASSERT_EQ(2U, [[view subviews] count]);
+  EXPECT_TRUE(
+      [[[view subviews] objectAtIndex:0] isKindOfClass:[NSView class]]);
+  EXPECT_TRUE(
+      [[[view subviews] objectAtIndex:0] conformsToProtocol:
+          @protocol(AutofillLayout)]);
+  EXPECT_TRUE(
+      [[[view subviews] objectAtIndex:1] isMemberOfClass:[NSImageView class]]);
 }