Restoring r29827....

chrome/browser/cocoa/autocomplete_text_field_unittest.mm

 // Copyright (c) 2009 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 <Cocoa/Cocoa.h>
 
 #import "base/cocoa_protocols_mac.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_unittest_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
 using ::testing::InSequence;
 
 // OCMock wants to mock a concrete class or protocol.  This should
 // provide a correct protocol for newer versions of the SDK, while
 // providing something mockable for older versions.
 
 @protocol MockTextEditingDelegate<NSControlTextEditingDelegate>
 - (void)controlTextDidBeginEditing:(NSNotification*)aNotification;
 - (BOOL)control:(NSControl*)control textShouldEndEditing:(NSText*)fieldEditor;
 @end
 
 namespace {
+// Mock a SecurityImageView.
+class MockSecurityImageView : public LocationBarViewMac::SecurityImageView {
+ public:
+  MockSecurityImageView(Profile* profile, ToolbarModel* model)
+  : LocationBarViewMac::SecurityImageView(profile, model) {}
+
+  MOCK_METHOD0(OnMousePressed, bool());
+};
 
 // Mock up an incrementing event number.
 NSUInteger eventNumber = 0;
 
 // Create an event of the indicated |type| at |point| within |view|.
 // TODO(shess): Would be nice to have a MockApplication which provided
 // nifty accessors to create these things and inject them.  It could
 // even provide functions for "Click and drag mouse from point A to
 // point B".
 NSEvent* Event(NSView* view, const NSPoint point, const NSEventType type,
@@ skipping 521 matching lines @@
   EXPECT_TRUE([field_ currentEditor]);
 
   // Selected the first word.
   const NSRange selectedRange([[field_ currentEditor] selectedRange]);
   EXPECT_EQ(selectedRange.location, 0U);
   EXPECT_EQ(selectedRange.length, [[field_ stringValue] length]);
 }
 
 TEST_F(AutocompleteTextFieldTest, SecurityIconMouseDown) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-  scoped_nsobject<NSImage> hintIcon(
-      [[NSImage alloc] initWithSize:NSMakeSize(20, 20)]);
-  [cell setHintIcon:hintIcon.get() label:nil color:nil];
-  NSRect iconFrame([cell hintImageFrameForFrame:[field_ bounds]]);
+
+  MockSecurityImageView security_image_view(NULL, NULL);
+  [cell setSecurityImageView:&security_image_view];
+  security_image_view.SetImageShown(
+      LocationBarViewMac::SecurityImageView::LOCK);
+  security_image_view.SetVisible(true);
+
+  NSRect iconFrame([cell securityImageFrameForFrame:[field_ bounds]]);
   NSPoint location(NSMakePoint(NSMidX(iconFrame), NSMidY(iconFrame)));
   NSEvent* event(Event(field_, location, NSLeftMouseDown, 1));
-  EXPECT_CALL(field_observer_, OnSecurityIconClicked());
+
+  EXPECT_CALL(security_image_view, OnMousePressed());
   [field_ mouseDown:event];
 }
 
 // Verify that -setAttributedStringValue: works as expected when
 // focussed or when not focussed.  Our code mostly depends on about
 // whether -stringValue works right.
 TEST_F(AutocompleteTextFieldTest, SetAttributedStringBaseline) {
   EXPECT_EQ(nil, [field_ currentEditor]);
 
   // So that we can set rich text.
@@ skipping 65 matching lines @@
   // editor's undo chain.
   [field_ setStringValue:@""];
   [editor shouldChangeTextInRange:NSMakeRange(0, 0) replacementString:@""];
   [editor didChangeText];
   EXPECT_TRUE([undoManager canUndo]);
   [field_ setAttributedStringValue:attributedString];
   EXPECT_TRUE([undoManager canUndo]);
 }
 
 }  // namespace