[Mac] Simplify field editor code which tracks whether editor rect changed.

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"
@@ skipping 240 matching lines @@
   NSRect frame = [field_ frame];
   frame.size.width += 10.0;
   [field_ setFrame:frame];
 }
 
 // Test that the field editor gets the same bounds when focus is
 // delivered by the standard focusing machinery, or by
 // -resetFieldEditorFrameIfNeeded.
 TEST_F(AutocompleteTextFieldTest, ResetFieldEditorBase) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
 
   // Capture the editor frame resulting from the standard focus
   // machinery.
   cocoa_helper_.makeFirstResponder(field_);
   const NSRect baseEditorFrame(EditorFrame());
 
   // Setting a hint should result in a strictly smaller editor frame.
+  EXPECT_FALSE([cell hintString]);
   [cell setSearchHintString:@"search hint" availableWidth:kWidth];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
+  EXPECT_TRUE([cell hintString]);
   [field_ resetFieldEditorFrameIfNeeded];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
   EXPECT_FALSE(NSEqualRects(baseEditorFrame, EditorFrame()));
   EXPECT_TRUE(NSContainsRect(baseEditorFrame, EditorFrame()));
 
   // Clearing hint string and using -resetFieldEditorFrameIfNeeded
   // should result in the same frame as the standard focus machinery.
   [cell clearKeywordAndHint];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
+  EXPECT_FALSE([cell hintString]);
   [field_ resetFieldEditorFrameIfNeeded];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
   EXPECT_TRUE(NSEqualRects(baseEditorFrame, EditorFrame()));
 }
 
 // Test that the field editor gets the same bounds when focus is
 // delivered by the standard focusing machinery, or by
 // -resetFieldEditorFrameIfNeeded.
 TEST_F(AutocompleteTextFieldTest, ResetFieldEditorSearchHint) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
 
   const NSString* kHintString(@"Type to search");
 
   // Capture the editor frame resulting from the standard focus
   // machinery.
   [cell setSearchHintString:kHintString availableWidth:kWidth];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
-  [cell setFieldEditorNeedsReset:NO];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
+  EXPECT_TRUE([cell hintString]);
   cocoa_helper_.makeFirstResponder(field_);
   const NSRect baseEditorFrame(EditorFrame());
 
   // Clearing the hint should result in a strictly larger editor
   // frame.
   [cell clearKeywordAndHint];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
+  EXPECT_FALSE([cell hintString]);
   [field_ resetFieldEditorFrameIfNeeded];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
   EXPECT_FALSE(NSEqualRects(baseEditorFrame, EditorFrame()));
   EXPECT_TRUE(NSContainsRect(EditorFrame(), baseEditorFrame));
 
   // Setting the same hint string and using
   // -resetFieldEditorFrameIfNeeded should result in the same frame as
   // the standard focus machinery.
   [cell setSearchHintString:kHintString availableWidth:kWidth];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
+  EXPECT_TRUE([cell hintString]);
   [field_ resetFieldEditorFrameIfNeeded];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
   EXPECT_TRUE(NSEqualRects(baseEditorFrame, EditorFrame()));
 }
 
 // Test that the field editor gets the same bounds when focus is
 // delivered by the standard focusing machinery, or by
 // -resetFieldEditorFrameIfNeeded.
 TEST_F(AutocompleteTextFieldTest, ResetFieldEditorKeywordHint) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
 
   const NSString* kFullString(@"Search Engine:");
   const NSString* kPartialString(@"Search Eng:");
 
   // Capture the editor frame resulting from the standard focus
   // machinery.
   [cell setKeywordString:kFullString
            partialString:kPartialString
           availableWidth:kWidth];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
-  [cell setFieldEditorNeedsReset:NO];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
+  EXPECT_TRUE([cell keywordString]);
   cocoa_helper_.makeFirstResponder(field_);
   const NSRect baseEditorFrame(EditorFrame());
 
   // Clearing the hint should result in a strictly larger editor
   // frame.
   [cell clearKeywordAndHint];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
+  EXPECT_FALSE([cell keywordString]);
   [field_ resetFieldEditorFrameIfNeeded];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
   EXPECT_FALSE(NSEqualRects(baseEditorFrame, EditorFrame()));
   EXPECT_TRUE(NSContainsRect(EditorFrame(), baseEditorFrame));
 
   // Setting the same hint string and using
   // -resetFieldEditorFrameIfNeeded should result in the same frame as
   // the standard focus machinery.
   [cell setKeywordString:kFullString
            partialString:kPartialString
           availableWidth:kWidth];
-  EXPECT_TRUE([cell fieldEditorNeedsReset]);
+  EXPECT_TRUE([cell keywordString]);
   [field_ resetFieldEditorFrameIfNeeded];
-  EXPECT_FALSE([cell fieldEditorNeedsReset]);
   EXPECT_TRUE(NSEqualRects(baseEditorFrame, EditorFrame()));
 }
 
 // Test that resetting the field editor bounds does not cause untoward
 // messages to the field's delegate.
 TEST_F(AutocompleteTextFieldTest, ResetFieldEditorBlocksEndEditing) {
   // First, test that -makeFirstResponder: sends
   // -controlTextDidBeginEditing: and -control:textShouldEndEditing at
   // the expected times.
   {
@@ skipping 32 matching lines @@
     [field_ setDelegate:mockDelegate];
 
     // Start editing.
     [[mockDelegate expect] controlTextDidBeginEditing:OCMOCK_ANY];
     NSTextView* editor = static_cast<NSTextView*>([field_ currentEditor]);
     [editor shouldChangeTextInRange:NSMakeRange(0, 0) replacementString:@""];
     [mockDelegate verify];
 
     // No more messages to mockDelegate.
     AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-    EXPECT_FALSE([cell fieldEditorNeedsReset]);
     [cell setSearchHintString:@"Type to search" availableWidth:kWidth];
-    EXPECT_TRUE([cell fieldEditorNeedsReset]);
     [field_ resetFieldEditorFrameIfNeeded];
     [mockDelegate verify];
 
     [field_ setDelegate:nil];
   }
 }
 
 // Clicking in the search hint should put the caret in the rightmost
 // position.
 TEST_F(AutocompleteTextFieldTest, ClickSearchHintPutsCaretRightmost) {
@@ skipping 160 matching lines @@
       [[NSImage alloc] initWithSize:NSMakeSize(20, 20)]);
   [cell setHintIcon:hintIcon.get() label:nil color:nil];
   NSRect iconFrame([cell hintImageFrameForFrame:[field_ bounds]]);
   NSPoint location(NSMakePoint(NSMidX(iconFrame), NSMidY(iconFrame)));
   NSEvent* event(Event(field_, location, NSLeftMouseDown, 1));
   EXPECT_CALL(field_observer_, OnSecurityIconClicked());
   [field_ mouseDown:event];
 }
 
 }  // namespace