Improve settings override bubble to indicate policy installed extensions

chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm

Index: chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm
index 31f91503e557f1ce7d8d4c5d1f6f258806da11a2..d6ef2cd5cb53d42057009a3c42772de77acd2448 100644
--- a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm
@@ -11,7 +11,11 @@
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/grit/components_scaled_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
+#include "ui/gfx/vector_icons_public.h"
 
 // A simple class to observe when a window is destructing.
 @interface WindowObserver : NSObject {
@@ -107,7 +111,12 @@ void ToolbarActionsBarBubbleMacTest::TestBubbleButton(
   TestToolbarActionsBarBubbleDelegate delegate(
       HeadingString(), BodyString(), ActionString());
   delegate.set_dismiss_button_text(DismissString());
-  delegate.set_learn_more_button_text(LearnMoreString());
+
+  ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text;
+  extra_view_info_linked_text.text = LearnMoreString();
+  extra_view_info_linked_text.is_text_linked = true;
+  delegate.set_extra_view_info(extra_view_info_linked_text);
+
   ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
   base::scoped_nsobject<WindowObserver> windowObserver(
       [[WindowObserver alloc] initWithWindow:[bubble window]]);
@@ -123,7 +132,7 @@ void ToolbarActionsBarBubbleMacTest::TestBubbleButton(
       button = [bubble dismissButton];
       break;
     case ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE:
-      button = [bubble learnMoreButton];
+      button = [bubble link];
       break;
     case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION:
       NOTREACHED();  // Deactivation is tested below.
@@ -160,7 +169,6 @@ TEST_F(ToolbarActionsBarBubbleMacTest, CloseActionAndDismiss) {
     base::scoped_nsobject<WindowObserver> windowObserver(
         [[WindowObserver alloc] initWithWindow:[bubble window]]);
     EXPECT_FALSE([windowObserver windowIsClosing]);
-

[Devlin, 2016/10/20 17:04:07]

nit: try not to make extraneous whitespace changes.

[catmullings, 2016/10/21 03:49:29]

Done.

     // Close the bubble. The delegate should be told it was dismissed.
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
@@ -179,7 +187,9 @@ TEST_F(ToolbarActionsBarBubbleMacTest, ToolbarActionsBarBubbleLayout) {
         HeadingString(), BodyString(), ActionString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_FALSE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_FALSE([bubble link]);
     EXPECT_FALSE([bubble dismissButton]);
     EXPECT_FALSE([bubble itemList]);
 
@@ -187,15 +197,22 @@ TEST_F(ToolbarActionsBarBubbleMacTest, ToolbarActionsBarBubbleLayout) {
     chrome::testing::NSRunLoopRunAllPending();
   }
 
-  // Test with all possible buttons (action, learn more, dismiss).
+  // Test with all possible buttons (action, link, dismiss).
   {
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
+
+    ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text;
+    extra_view_info_linked_text.text = LearnMoreString();
+    extra_view_info_linked_text.is_text_linked = true;
+    delegate.set_extra_view_info(extra_view_info_linked_text);
+
     delegate.set_dismiss_button_text(DismissString());
-    delegate.set_learn_more_button_text(LearnMoreString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_TRUE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_TRUE([bubble link]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_FALSE([bubble itemList]);
 
@@ -210,7 +227,9 @@ TEST_F(ToolbarActionsBarBubbleMacTest, ToolbarActionsBarBubbleLayout) {
     delegate.set_dismiss_button_text(DismissString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_FALSE([bubble actionButton]);
-    EXPECT_FALSE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_FALSE([bubble link]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_FALSE([bubble itemList]);
 
@@ -225,7 +244,9 @@ TEST_F(ToolbarActionsBarBubbleMacTest, ToolbarActionsBarBubbleLayout) {
     delegate.set_item_list_text(ItemListString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_FALSE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_FALSE([bubble link]);
     EXPECT_FALSE([bubble dismissButton]);
     EXPECT_TRUE([bubble itemList]);
 
@@ -233,16 +254,47 @@ TEST_F(ToolbarActionsBarBubbleMacTest, ToolbarActionsBarBubbleLayout) {
     chrome::testing::NSRunLoopRunAllPending();
   }
 
+  // Test with an extra view of a (unlinked) text and icon and action button.
+  {
+    TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
+                                                 ActionString());
+
+    ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info;
+    extra_view_info.resource_id = gfx::VectorIconId::BUSINESS;
+    extra_view_info.text =
+        l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN);
+    extra_view_info.is_text_linked = false;
+    delegate.set_extra_view_info(extra_view_info);
+
+    ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
+    EXPECT_TRUE([bubble actionButton]);
+    EXPECT_TRUE([bubble iconView]);
+    EXPECT_TRUE([bubble label]);
+    EXPECT_FALSE([bubble link]);
+    EXPECT_FALSE([bubble dismissButton]);
+    EXPECT_FALSE([bubble itemList]);
+
+    [bubble close];
+    chrome::testing::NSRunLoopRunAllPending();
+  }
+
   // Test with all possible fields.
   {
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
+
+    ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text;
+    extra_view_info_linked_text.text = LearnMoreString();
+    extra_view_info_linked_text.is_text_linked = true;
+    delegate.set_extra_view_info(extra_view_info_linked_text);
+
     delegate.set_dismiss_button_text(DismissString());
-    delegate.set_learn_more_button_text(LearnMoreString());
     delegate.set_item_list_text(ItemListString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_TRUE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_TRUE([bubble link]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_TRUE([bubble itemList]);