[Mac] Website settings: Add cookie info & permission icons, plus other visual fixes.

chrome/browser/ui/cocoa/website_settings_bubble_controller_unittest.mm

 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/website_settings_bubble_controller.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest_mac.h"
 
 @interface WebsiteSettingsBubbleController (ExposedForTesting)
-- (NSView*)permissionsContentView;
+- (NSView*)permissionsView;
 - (NSImageView*)identityStatusIcon;
 - (NSTextField*)identityStatusDescriptionField;
 - (NSImageView*)connectionStatusIcon;
 - (NSTextField*)connectionStatusDescriptionField;
 - (NSTextField*)firstVisitDescriptionField;
 @end
 
 @implementation WebsiteSettingsBubbleController (ExposedForTesting)
-- (NSView*)permissionsContentView {
-  return permissionsContentView_;
+- (NSView*)permissionsView {
+  return permissionsView_;
 }
 
 - (NSImageView*)identityStatusIcon {
   return identityStatusIcon_;
 }
 
 - (NSTextField*)identityStatusDescriptionField {
   return identityStatusDescriptionField_;
 }
 
@@ skipping 165 matching lines @@
   PermissionInfoList list;
   WebsiteSettingsUI::PermissionInfo info;
   info.setting = CONTENT_SETTING_ALLOW;
   info.default_setting = CONTENT_SETTING_ALLOW;
   for (size_t i = 0; i < arraysize(kTestPermissionTypes); ++i) {
     info.type = kTestPermissionTypes[i];
     list.push_back(info);
   }
   bridge_->SetPermissionInfo(list);
 
-  // There should be two subviews per permission: a label and a select box.
-  NSArray* subviews = [[controller_ permissionsContentView] subviews];
-  EXPECT_EQ(arraysize(kTestPermissionTypes) * 2, [subviews count]);
+  // There should be three subviews per permission (an icon, a label and a
+  // select box), plus a text label for the Permission section.
+  NSArray* subviews = [[controller_ permissionsView] subviews];
+  EXPECT_EQ(arraysize(kTestPermissionTypes) * 3 + 1, [subviews count]);
 
   // Ensure that there is a distinct label for each permission.
   NSMutableSet* labels = [NSMutableSet set];
   for (NSView* view in subviews) {
     if ([view isKindOfClass:[NSTextField class]])
       [labels addObject:[static_cast<NSTextField*>(view) stringValue]];
   }
-  EXPECT_EQ(arraysize(kTestPermissionTypes), [labels count]);
+  // The section header ("Permissions") will also be found, hence the +1.
+  EXPECT_EQ(arraysize(kTestPermissionTypes) + 1, [labels count]);
 
   // Find the first permission pop-up button
   NSPopUpButton* button = nil;
   for (NSView* view in subviews) {
     if ([view isKindOfClass:[NSPopUpButton class]]) {
       button = static_cast<NSPopUpButton*>(view);
       break;
     }
   }
   ASSERT_NSNE(nil, button);
 
   // Check that the button title is updated when the setting is changed.
 
   NSString* original_title = [[[button cell] menuItem] title];
   [button selectItemAtIndex:kMenuIndexContentSettingBlock];
   [controller_ permissionValueChanged:button];
   EXPECT_NSNE(original_title, [[[button cell] menuItem] title]);
 
   [button selectItemAtIndex:kMenuIndexContentSettingDefault];
   [controller_ permissionValueChanged:button];
   EXPECT_NSNE(original_title, [[[button cell] menuItem] title]);
 
   [button selectItemAtIndex:kMenuIndexContentSettingAllow];
   [controller_ permissionValueChanged:button];
   EXPECT_NSEQ(original_title, [[[button cell] menuItem] title]);
 }
 
 }  // namespace