Omnibox M5 work, part 1: Security changes...

chrome/browser/cocoa/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 "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"
 
 namespace {
 
 // Width of the field so that we don't have to ask |field_| for it all
 // the time.
 const CGFloat kWidth(300.0);
 
 // A narrow width for tests which test things that don't fit.
@@ skipping 173 matching lines @@
   // Text frame should take everything over again on reset.
   [cell clearKeywordAndHint];
   textFrame = [cell textFrameForFrame:bounds];
   EXPECT_FALSE(NSIsEmptyRect(textFrame));
   EXPECT_TRUE(NSContainsRect(bounds, textFrame));
   EXPECT_EQ(NSMinX(bounds), NSMinX(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_.SetImageShown(IDR_SECURE);
   security_image_view_.SetVisible(true);
 
   textFrame = [cell textFrameForFrame:bounds];
   EXPECT_FALSE(NSIsEmptyRect(textFrame));
   EXPECT_TRUE(NSContainsRect(bounds, textFrame));
   EXPECT_LT(NSMaxX(textFrame), NSMaxX(bounds));
   EXPECT_TRUE(NSContainsRect(cursorFrame, textFrame));
 
   // Search hint text takes precedence over the hint icon; the text frame
   // should be smaller in order to accomodate the text that is wider than
@@ skipping 43 matching lines @@
   EXPECT_FALSE(NSIsEmptyRect(drawingRect));
   EXPECT_TRUE(NSContainsRect(NSInsetRect(textFrame, 1, 1), drawingRect));
 
   [cell clearKeywordAndHint];
   textFrame = [cell textFrameForFrame:bounds];
   drawingRect = [cell drawingRectForBounds:bounds];
   EXPECT_FALSE(NSIsEmptyRect(drawingRect));
   EXPECT_TRUE(NSContainsRect(NSInsetRect(textFrame, 1, 1), drawingRect));
   EXPECT_TRUE(NSEqualRects(drawingRect, originalDrawingRect));
 
-  security_image_view_.SetImageShown(
-      LocationBarViewMac::SecurityImageView::LOCK);
+  security_image_view_.SetImageShown(IDR_SECURE);
   security_image_view_.SetVisible(true);
 
   textFrame = [cell textFrameForFrame:bounds];
   drawingRect = [cell drawingRectForBounds:bounds];
   EXPECT_FALSE(NSIsEmptyRect(drawingRect));
   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) {
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
   const NSRect bounds([view_ bounds]);
-  security_image_view_.SetImageShown(
-      LocationBarViewMac::SecurityImageView::LOCK);
+  security_image_view_.SetImageShown(IDR_SECURE);
 
   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];
 
   EXPECT_FALSE(NSIsEmptyRect(iconRect));
@@ skipping 47 matching lines @@
   EXPECT_EQ(1u, [cell pageActionCount]);
   list.Add(&page_action_view2);
   EXPECT_EQ(2u, [cell pageActionCount]);
 }
 
 // Test that Page Action icons are properly placed.
 TEST_F(AutocompleteTextFieldCellTest, PageActionImageFrame) {
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
   const NSRect bounds([view_ bounds]);
-  security_image_view_.SetImageShown(
-      LocationBarViewMac::SecurityImageView::LOCK);
+  security_image_view_.SetImageShown(IDR_SECURE);
 
   TestPageActionImageView page_action_view;
   // We'll assume that the extensions code enforces icons smaller than the
   // location bar.
   NSImage* image = [[[NSImage alloc]
       initWithSize:NSMakeSize(NSHeight(bounds) - 4, NSHeight(bounds) - 4)]
       autorelease];
   page_action_view.SetImage(image);
 
   TestPageActionImageView page_action_view2;
@@ skipping 130 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