Merge 52385 - [Mac] Bring back the omnibox globe for an encore....

chrome/browser/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm

 // Copyright (c) 2010 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>
 
 #include "app/resource_bundle.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.h"
@@ skipping 99 matching lines @@
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
 
   [cell setSearchHintString:@"Type to search" availableWidth:kWidth];
   [view_ display];
 
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
   [cell setKeywordHintPrefix:@"prefix" image:image suffix:@"suffix"
               availableWidth:kWidth];
   [view_ display];
 
-  // Load available decorations and try drawing.
+  // Load available decorations and try drawing.  To make sure that
+  // they are actually drawn, check that |GetWidthForSpace()| doesn't
+  // indicate that they should be omitted.
+  const CGFloat kVeryWide = 1000.0;
+
   SelectedKeywordDecoration selected_keyword_decoration([view_ font]);
   selected_keyword_decoration.SetVisible(true);
   selected_keyword_decoration.SetKeyword(std::wstring(L"Google"), false);
   [cell addLeftDecoration:&selected_keyword_decoration];
+  EXPECT_NE(selected_keyword_decoration.GetWidthForSpace(kVeryWide),
+            LocationBarDecoration::kOmittedWidth);
 
   // TODO(shess): This really wants a |LocationBarViewMac|, but only a
   // few methods reference it, so this works well enough.  But
   // something better would be nice.
   LocationIconDecoration location_icon_decoration(NULL);
   location_icon_decoration.SetVisible(true);
   location_icon_decoration.SetImage([NSImage imageNamed:@"NSApplicationIcon"]);
   [cell addLeftDecoration:&location_icon_decoration];
+  EXPECT_NE(location_icon_decoration.GetWidthForSpace(kVeryWide),
+            LocationBarDecoration::kOmittedWidth);
 
   EVBubbleDecoration ev_bubble_decoration(&location_icon_decoration,
                                           [view_ font]);
   ev_bubble_decoration.SetVisible(true);
   ev_bubble_decoration.SetImage([NSImage imageNamed:@"NSApplicationIcon"]);
   ev_bubble_decoration.SetLabel(@"Application");
   [cell addLeftDecoration:&ev_bubble_decoration];
+  EXPECT_NE(ev_bubble_decoration.GetWidthForSpace(kVeryWide),
+            LocationBarDecoration::kOmittedWidth);
 
   // Make sure we're actually calling |DrawInFrame()|.
   StrictMock<MockDecoration> mock_decoration;
   mock_decoration.SetVisible(true);
   [cell addLeftDecoration:&mock_decoration];
   EXPECT_CALL(mock_decoration, DrawInFrame(_, _));
+  EXPECT_NE(mock_decoration.GetWidthForSpace(kVeryWide),
+            LocationBarDecoration::kOmittedWidth);
 
   [view_ display];
 
   [cell clearDecorations];
 }
 
 TEST_F(AutocompleteTextFieldCellTest, ClearKeywordAndHint) {
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
   EXPECT_FALSE([cell hintString]);
@@ skipping 275 matching lines @@
   EXPECT_TRUE([[[cell hintString] string] hasPrefix:kHintPrefix]);
   EXPECT_TRUE([[[cell hintString] string] hasSuffix:kHintSuffix]);
 
   // Narrow width suppresses everything but the image.
   [cell setKeywordHintPrefix:kHintPrefix image:image suffix:kHintSuffix
               availableWidth:kNarrowWidth];
   EXPECT_EQ([[cell hintString] length], 1U);
 }
 
 }  // namespace