[Mac] Rearrange SSL status icon/label in omnibox.

chrome/browser/cocoa/autocomplete_text_field_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"
 #import "base/cocoa_protocols_mac.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
@@ skipping 563 matching lines @@
   [NSApp postEvent:upEvent3 atStart:YES];
   [field_ mouseDown:downEvent3];
   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]);
 }
 
-// Clicking the location icon should call its OnMousePressed.
-TEST_F(AutocompleteTextFieldObserverTest, LocationIconMouseDown) {
+// Clicking the security icon should call its OnMousePressed.
+TEST_F(AutocompleteTextFieldTest, LocationIconMouseDown) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
 
   MockLocationIconView location_icon_view(NULL);
   [cell setLocationIconView:&location_icon_view];
   location_icon_view.SetImage(
       ResourceBundle::GetSharedInstance().GetNSImageNamed(IDR_SECURE));
   location_icon_view.SetVisible(true);
 
   NSRect iconFrame([cell locationIconFrameForFrame:[field_ bounds]]);
   NSPoint location(NSMakePoint(NSMidX(iconFrame), NSMidY(iconFrame)));
   NSEvent* event(Event(field_, location, NSLeftMouseDown, 1));
 
   [field_ mouseDown:event];
   EXPECT_TRUE(location_icon_view.mouse_was_pressed_);
 }
 
 // Clicking a Page Action icon should call its OnMousePressed.
-TEST_F(AutocompleteTextFieldObserverTest, PageActionMouseDown) {
+TEST_F(AutocompleteTextFieldTest, PageActionMouseDown) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
 
   MockLocationIconView location_icon_view(NULL);
   location_icon_view.SetImage(
       ResourceBundle::GetSharedInstance().GetNSImageNamed(IDR_SECURE));
   [cell setLocationIconView:&location_icon_view];
 
   MockPageActionImageView page_action_view;
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
   page_action_view.SetImage(image);
@@ skipping 240 matching lines @@
   scoped_nsobject<AutocompleteTextField> pin([field_ retain]);
   [field_ removeFromSuperview];
   [test_window() resignKeyWindow];
 
   [[test_window() contentView] addSubview:field_];
   EXPECT_CALL(field_observer_, OnDidResignKey());
   [test_window() resignKeyWindow];
 }
 
 }  // namespace