Re-instate the temporary revert from r45267. That reverted certain

Omnibox, toolbar, tab animations, and other UI changes for purposes of
testing and merging into mstone-5.

Additionally reverts these CLs to fix the earlier revert:
r45271: [Mac] Image references missing from Omnibox revert.
r45268: GTK fix merge failure in uber-revert.

Additional revert which fixed a bug for the branch:
r45381: [Mac] Omnibox popup icons and text lined up under toolbar.

Slight merge conflict which should be good:
r45322: GTK: Implement OnDragCanceled() for autocomplete...

Also ++kThemePackVersion and regenerate the cached theme pak.

Re-instated changes:
r45213: GTK: Override cursor colors in chrome-theme mode.
r45103: Support drawing nano tabs in the tabstrip.
r45084: GTK: Position the EV certificate stuff inside a green bubble.
r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon...
r44957: GTK: Tint the geolocation icons in gtk mode.
r44943: Changes FormatURL to not strip http if the host starts with ft...
r44930: Remove an icon that is no longer used.
r44929: SSL UI changes, Windows, code side (images are separate).
r44859: SSL UI changes (icons).  TBRed since trybots hate binary patches.
r44822: GTK: Select better greens in the native omnibox popup.
r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat...
r44789: [Mac] Bookmark star missing on NTP and BMM.
r44775: [Mac] Centralize hack to make tests work with AutocompleteClas...
r44678: Display the SECURITY_WARNING status in the location bar for the
r44648: [Mac] Add an arrow cursor rect for the location image.
r44615: Revert r44611 because it may have broken "unit_tests" on "Vist...
r44611: Display the SECURITY_WARNING status in the location bar for the
r44577: Revert 44572 - [Mac] Update locationbar icon as user types.
r44572: [Mac] Update location-bar icon as user types.
r44555: GTK: Use correct button mask on reload button.
r44545: [Mac] Omnibox text drag drag URL when select-all.
r44523: GTK: Prevent inappropriate drag of location bar location icon.
r44519: GTK: make the primary selection include the url's scheme when ...
r44492: [Mac] Fix search icon in keyword search to be right-side-up.
r44415: GTK: Update top padding on icons in the autocomplete popup.
r44401: GTK: Tint omnibox icons in GTK mode differently.
r44380: GTK: Move reload in gtk mode and fix omnibox popup location.
r44282: Fixes crash in autocomplete when typing some URLs. The problem
r44273: [Mac] PDF icons for omnibox nits.
r44269: Fix build break due to bad merge resolve
r44268: Shift omnibox dropdown in and up on Windows, and square off th...
r44178: GTK: fix TTS padding.
r44177: Round the top left and right edges of the toolbar.
r44171: Images only checkin for try server goodness.
r44163: GTK: fix padding of autocomplete popup.
r44152: [Mac] PDF icons for omnibox.
r44145: GTK: Theme the icons in the location bar and use GTK colors fo...
r44140: Strips http from the omnibox
r44131: Fixes bugs in new tab strip animations where they weren't doin...
r44116: Change the default theme colors.
r44117: Add newline to EOF to fix CrOS builder.
r44115: Make the bottom edges of the opaque frame rounded.
r44091: [Mac] No star icon or page actions in omnibox on popups.
r44087: Don't allow drag or click on location icon when editing in omn...
r44021: [GTK] Add TTS lens graphic to linux TTS box.
r44008: [Mac] Tweak location icon spacing in omnibox.
r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca...
r43972: Make the firstrun bubble point at a better spot now that the l...
r43971: [Mac] Location icon in omnibox as drag source.
r43970: Make the star and page action icons not appear on popup windows.
r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly
r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip:
r43787: Allow location icon to be dragged & dropped.  This also fixes ...
r43759: Changes end cap of tab-to-search images.
r43740: Change bookmark bar toggle to ctrl-shift-b.
r43723: Show Page Info dialog on mouse up, not mouse down.
r43677: Fix Mac build failure.
r43676: Replace omnibox icons with new set that are all the same size ...
r43596: Fix browser test TestStarButtonAccObj.
r43593: Disables TestStarButtonAccObj.
r43582: Changes tab strip to use BoundsAnimator for tab strip animatio...
r43563: GTK: don't show reload button for popup/app windows.
r43562: Star/reload shuffle, Windows version.
r43540: [Mac] Magnifying glass in keyword-search bubble.
r43482: Adds images needed for new tab animation. I'm separating this ...
r43422: Add reload mask resource.
r43392: GTK: make the location icon a drag source.
r43376: [Mac] Move star button into page-actions area of omnibox.
r43357: [Mac] Line up omnibox popup under field.
r43290: gtk: fix display of icons in omnibox popup
r43269: GTK: fix reload button.
r43249: [Mac] Rearrange SSL status icon/label in omnibox.
r43248: BrowserThemePack: Adds persistant ids for the reload endcaps.
r43241: GTK: more location bar updates.
r43191: Fix memory leak in BrowserThemePack.
r43154: GTK: set the new star button's ID
r43151: Fix bad conflict resolution for r43146.
r43146: GTK: toolbar reload/star shuffle.
r43025: Show the location bar icon (almost) all the time, and have its...
r43023: Add new images for new reload button. No code change.
r42782: Remove this icon, now that it's no longer used (due to my secu...
r42502: Omnibox M5 work, part 1: Security changes
r42245: Check in new icons for omnibox security changes alone, so that...

BUG=none
TEST=People go back to complaining about missing http://.
R=pkasting@chromium.org,beng@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45474 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 80 insertions, 59 deletions

diff --git a/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm b/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm
index 0a16c48..5bd02cc 100644
--- a/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm
@@ -4,9 +4,11 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "app/resource_bundle.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
+#include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ -43,7 +45,7 @@ class TestPageActionViewList : public LocationBarViewMac::PageActionViewList {
 
 class AutocompleteTextFieldCellTest : public CocoaTest {
  public:
-  AutocompleteTextFieldCellTest() : security_image_view_(NULL, NULL, NULL),
+  AutocompleteTextFieldCellTest() : location_icon_view_(NULL),
                                     page_action_views_() {
     // Make sure this is wide enough to play games with the cell
     // decorations.
@@ -57,7 +59,8 @@ class AutocompleteTextFieldCellTest : public CocoaTest {
         [[AutocompleteTextFieldCell alloc] initTextCell:@"Testing"]);
     [cell setEditable:YES];
     [cell setBordered:YES];
-    [cell setSecurityImageView:&security_image_view_];
+    [cell setLocationIconView:&location_icon_view_];
+    [cell setSecurityLabelView:&security_label_view_];
     [cell setPageActionViewList:&page_action_views_];
     [view_ setCell:cell.get()];
 
@@ -65,7 +68,8 @@ class AutocompleteTextFieldCellTest : public CocoaTest {
   }
 
   NSTextField* view_;
-  LocationBarViewMac::SecurityImageView security_image_view_;
+  LocationBarViewMac::LocationIconView location_icon_view_;
+  LocationBarViewMac::LocationBarImageView security_label_view_;
   TestPageActionViewList page_action_views_;
 };
 
@@ -199,15 +203,16 @@ TEST_F(AutocompleteTextFieldCellTest, TextFrame) {
   EXPECT_EQ(NSMaxX(bounds), NSMaxX(textFrame));
   EXPECT_TRUE(NSContainsRect(cursorFrame, textFrame));
 
-  // Security icon takes up space on the right
-  security_image_view_.SetImageShown(
-      LocationBarViewMac::SecurityImageView::LOCK);
-  security_image_view_.SetVisible(true);
+  // Location icon takes up space on the left
+  location_icon_view_.SetImage(
+      ResourceBundle::GetSharedInstance().GetNSImageNamed(
+          IDR_OMNIBOX_HTTPS_VALID));
+  location_icon_view_.SetVisible(true);
 
   textFrame = [cell textFrameForFrame:bounds];
   EXPECT_FALSE(NSIsEmptyRect(textFrame));
   EXPECT_TRUE(NSContainsRect(bounds, textFrame));
-  EXPECT_LT(NSMaxX(textFrame), NSMaxX(bounds));
+  EXPECT_GT(NSMinX(textFrame), NSMinX(bounds));
   EXPECT_TRUE(NSContainsRect(cursorFrame, textFrame));
 
   // Search hint text takes precedence over the hint icon; the text frame
@@ -265,9 +270,10 @@ TEST_F(AutocompleteTextFieldCellTest, DrawingRectForBounds) {
   EXPECT_TRUE(NSContainsRect(NSInsetRect(textFrame, 1, 1), drawingRect));
   EXPECT_TRUE(NSEqualRects(drawingRect, originalDrawingRect));
 
-  security_image_view_.SetImageShown(
-      LocationBarViewMac::SecurityImageView::LOCK);
-  security_image_view_.SetVisible(true);
+  location_icon_view_.SetImage(
+      ResourceBundle::GetSharedInstance().GetNSImageNamed(
+          IDR_OMNIBOX_HTTPS_VALID));
+  location_icon_view_.SetVisible(true);
 
   textFrame = [cell textFrameForFrame:bounds];
   drawingRect = [cell drawingRectForBounds:bounds];
@@ -275,55 +281,60 @@ TEST_F(AutocompleteTextFieldCellTest, DrawingRectForBounds) {
   EXPECT_TRUE(NSContainsRect(NSInsetRect(textFrame, 1, 1), drawingRect));
 }
 
-// Test that the security icon is at the right side of the cell.
-TEST_F(AutocompleteTextFieldCellTest, SecurityImageFrame) {
+// Test that the location icon is at the right side of the cell.
+TEST_F(AutocompleteTextFieldCellTest, LocationIconFrame) {
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
   const NSRect bounds([view_ bounds]);
-  security_image_view_.SetImageShown(
-      LocationBarViewMac::SecurityImageView::LOCK);
-
-  security_image_view_.SetVisible(false);
-  EXPECT_EQ(0u, [[cell layedOutIcons:bounds] count]);
-
-  security_image_view_.SetVisible(true);
-  NSArray* icons = [cell layedOutIcons:bounds];
-  ASSERT_EQ(1u, [icons count]);
-  NSRect iconRect = [[icons objectAtIndex:0] rect];
+  location_icon_view_.SetImage(
+      ResourceBundle::GetSharedInstance().GetNSImageNamed(
+          IDR_OMNIBOX_HTTPS_VALID));
 
+  location_icon_view_.SetVisible(true);
+  const NSRect iconRect = [cell locationIconFrameForFrame:bounds];
   EXPECT_FALSE(NSIsEmptyRect(iconRect));
   EXPECT_TRUE(NSContainsRect(bounds, iconRect));
 
-  // Make sure we are right of the |drawingRect|.
-  NSRect drawingRect = [cell drawingRectForBounds:bounds];
-  EXPECT_LE(NSMaxX(drawingRect), NSMinX(iconRect));
+  // Location icon should be left of |drawingRect|.
+  const NSRect drawingRect = [cell drawingRectForBounds:bounds];
+  EXPECT_GT(NSMinX(drawingRect), NSMinX(iconRect));
 
-  // Make sure we're right of the |textFrame|.
-  NSRect textFrame = [cell textFrameForFrame:bounds];
-  EXPECT_LE(NSMaxX(textFrame), NSMinX(iconRect));
+  // Location icon should be left of |textFrame|.
+  const NSRect textFrame = [cell textFrameForFrame:bounds];
+  EXPECT_GT(NSMinX(textFrame), NSMinX(iconRect));
+}
+
+// Test that security label takes space to the right.
+TEST_F(AutocompleteTextFieldCellTest, SecurityLabelFrame) {
+  AutocompleteTextFieldCell* cell =
+      static_cast<AutocompleteTextFieldCell*>([view_ cell]);
+  const NSRect bounds([view_ bounds]);
+
+  // No label shows nothing, regardless of visibility setting.
+  security_label_view_.SetVisible(false);
+  const NSRect baseTextFrame = [cell textFrameForFrame:bounds];
+  security_label_view_.SetVisible(true);
+  EXPECT_TRUE(NSEqualRects(baseTextFrame, [cell textFrameForFrame:bounds]));
 
-  // Now add a label.
+  // Still not visible even with a label.
   NSFont* font = [NSFont controlContentFontOfSize:12.0];
   NSColor* color = [NSColor blackColor];
-  security_image_view_.SetLabel(@"Label", font, color);
-  icons = [cell layedOutIcons:bounds];
-  ASSERT_EQ(1u, [icons count]);
-  iconRect = [[icons objectAtIndex:0] rect];
+  security_label_view_.SetLabel(@"Label", font, color);
+  security_label_view_.SetVisible(false);
+  EXPECT_TRUE(NSEqualRects(baseTextFrame, [cell textFrameForFrame:bounds]));
 
-  EXPECT_FALSE(NSIsEmptyRect(iconRect));
-  EXPECT_TRUE(NSContainsRect(bounds, iconRect));
-
-  // Make sure we are right of the |drawingRect|.
-  drawingRect = [cell drawingRectForBounds:bounds];
-  EXPECT_LE(NSMaxX(drawingRect), NSMinX(iconRect));
+  // Visible with a label is strictly narrower than without.
+  security_label_view_.SetVisible(true);
+  NSRect textFrame = [cell textFrameForFrame:bounds];
+  const CGFloat labelWidth = [security_label_view_.GetLabel() size].width;
+  EXPECT_TRUE(NSContainsRect(baseTextFrame, textFrame));
+  EXPECT_LT(NSWidth(textFrame), NSWidth(baseTextFrame) - labelWidth);
 
-  // Make sure we're right of the |textFrame|.
+  NSString* longLabel =
+      @"Really super-long labels will not show up if there's not enough room.";
+  security_label_view_.SetLabel(longLabel, font, color);
   textFrame = [cell textFrameForFrame:bounds];
-  EXPECT_LE(NSMaxX(textFrame), NSMinX(iconRect));
-
-  // Make sure we clear correctly.
-  security_image_view_.SetVisible(false);
-  EXPECT_EQ(0u, [[cell layedOutIcons:bounds] count]);
+  EXPECT_TRUE(NSEqualRects(baseTextFrame, [cell textFrameForFrame:bounds]));
 }
 
 // Test Page Action counts.
@@ -349,8 +360,6 @@ TEST_F(AutocompleteTextFieldCellTest, PageActionImageFrame) {
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
   const NSRect bounds([view_ bounds]);
-  security_image_view_.SetImageShown(
-      LocationBarViewMac::SecurityImageView::LOCK);
 
   TestPageActionImageView page_action_view;
   // We'll assume that the extensions code enforces icons smaller than the
@@ -368,13 +377,12 @@ TEST_F(AutocompleteTextFieldCellTest, PageActionImageFrame) {
   list.Add(&page_action_view2);
   [cell setPageActionViewList:&list];
 
-  security_image_view_.SetVisible(false);
   page_action_view.SetVisible(false);
   page_action_view2.SetVisible(false);
   EXPECT_TRUE(NSIsEmptyRect([cell pageActionFrameForIndex:0 inFrame:bounds]));
   EXPECT_TRUE(NSIsEmptyRect([cell pageActionFrameForIndex:1 inFrame:bounds]));
 
-  // One page action, no security icon.
+  // One page action, no lock icon.
   page_action_view.SetVisible(true);
   NSRect iconRect0 = [cell pageActionFrameForIndex:0 inFrame:bounds];
 
@@ -389,17 +397,19 @@ TEST_F(AutocompleteTextFieldCellTest, PageActionImageFrame) {
   NSRect textFrame = [cell textFrameForFrame:bounds];
   EXPECT_LE(NSMaxX(textFrame), NSMinX(iconRect0));
 
-  // Two page actions plus a security icon.
+  // Two page actions plus a security label.
   page_action_view2.SetVisible(true);
-  security_image_view_.SetVisible(true);
   NSArray* icons = [cell layedOutIcons:bounds];
-  EXPECT_EQ(3u, [icons count]);
+  ASSERT_EQ(2u, [icons count]);
+
+  // TODO(shess): page-action list is inverted from -layedOutIcons:
+  // Yes, this is confusing, fix it.
   iconRect0 = [cell pageActionFrameForIndex:0 inFrame:bounds];
   NSRect iconRect1 = [cell pageActionFrameForIndex:1 inFrame:bounds];
-  NSRect lockRect = [[icons objectAtIndex:0] rect];
+  NSRect labelRect = [[icons objectAtIndex:0] rect];
 
   EXPECT_TRUE(NSEqualRects(iconRect0, [[icons objectAtIndex:1] rect]));
-  EXPECT_TRUE(NSEqualRects(iconRect1, [[icons objectAtIndex:2] rect]));
+  EXPECT_TRUE(NSEqualRects(iconRect1, [[icons objectAtIndex:0] rect]));
 
   // Make sure they're all in the expected order, and right of the |drawingRect|
   // and |textFrame|.
@@ -410,13 +420,13 @@ TEST_F(AutocompleteTextFieldCellTest, PageActionImageFrame) {
   EXPECT_TRUE(NSContainsRect(bounds, iconRect0));
   EXPECT_FALSE(NSIsEmptyRect(iconRect1));
   EXPECT_TRUE(NSContainsRect(bounds, iconRect1));
-  EXPECT_FALSE(NSIsEmptyRect(lockRect));
-  EXPECT_TRUE(NSContainsRect(bounds, lockRect));
+  EXPECT_FALSE(NSIsEmptyRect(labelRect));
+  EXPECT_TRUE(NSContainsRect(bounds, labelRect));
 
   EXPECT_LE(NSMaxX(drawingRect), NSMinX(iconRect1));
   EXPECT_LE(NSMaxX(textFrame), NSMinX(iconRect1));
   EXPECT_LE(NSMaxX(iconRect1), NSMinX(iconRect0));
-  EXPECT_LE(NSMaxX(iconRect0), NSMinX(lockRect));
+  EXPECT_LE(NSMaxX(labelRect), NSMinX(iconRect0));
 }
 
 // Test that the cell correctly chooses the partial keyword if there's
@@ -428,11 +438,22 @@ TEST_F(AutocompleteTextFieldCellTest, UsesPartialKeywordIfNarrow) {
   const NSString* kFullString = @"Search Engine:";
   const NSString* kPartialString = @"Search Eng:";
 
-  // Wide width chooses the full string.
+  // Wide width chooses the full string, including an image on the
+  // left.
   [cell setKeywordString:kFullString
            partialString:kPartialString
           availableWidth:kWidth];
   EXPECT_TRUE([cell keywordString]);
+  EXPECT_TRUE([[[cell keywordString] string] hasSuffix:kFullString]);
+  EXPECT_TRUE([[cell keywordString] containsAttachments]);
+
+  // If not enough space to include the image, uses exactly the full
+  // string.
+  CGFloat allWidth = [[cell keywordString] size].width;
+  [cell setKeywordString:kFullString
+           partialString:kPartialString
+          availableWidth:allWidth - 5.0];
+  EXPECT_TRUE([cell keywordString]);
   EXPECT_TRUE([[[cell keywordString] string] isEqualToString:kFullString]);
 
   // Narrow width chooses the partial string.