Improve settings override bubble to indicate policy installed extensions

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc

Index: chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
index d5d1f6cbcb1c9d8f41441d5ba5764e3c12df8406..22fcb1e09f2c95db1798ac54a7da3294a07fb655 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
@@ -9,6 +9,10 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
+#include "chrome/browser/ui/toolbar/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"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/button/label_button.h"
@@ -19,6 +23,11 @@
 #include "ui/views/window/dialog_client_view.h"
 
 class ToolbarActionsBarBubbleViewsTest : public views::ViewsTestBase {
+ public:
+  views::View* TestCreateExtraView() {
+    return (bubble_) ? bubble_->CreateExtraView() : nullptr;
+  }
+
  protected:
   ToolbarActionsBarBubbleViewsTest() {}
   ~ToolbarActionsBarBubbleViewsTest() override {}
@@ -260,3 +269,84 @@ TEST_F(ToolbarActionsBarBubbleViewsTest, TestDontCloseOnDeactivation) {
   EXPECT_FALSE(delegate.close_action());
   CloseBubble();
 }
+
+TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewEmpty) {
+  TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
+                                               ActionString());
+  ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info;
+
+  ShowBubble(&delegate);
+
+  views::View* extra_view = TestCreateExtraView();
+  EXPECT_FALSE(extra_view);
+  CloseBubble();
+}
+
+TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewIconOnly) {
+  TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
+                                               ActionString());
+  ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info;
+
+  extra_view_info.resource_id = IDR_OMNIBOX_HTTPS_POLICY_WARNING;
+  delegate.set_extra_view_info(extra_view_info);
+  ShowBubble(&delegate);
+  std::unique_ptr<views::View> extra_view(TestCreateExtraView());

[catmullings, 2016/09/22 00:00:11]

Should I wrap this in a unique_ptr to ensure the view is destroyed after it goes
out of scope? TestCreateExtraView() calls CreateExtraView(), which uses "new" to
construct a view.

views::View * CreateExtraView is the method signature defined in a higher
parent, abstract class, so if I were to change that to return a unique_ptr
there, multiple changes would need to be made.

[Devlin, 2016/09/26 20:13:09]

Wrapping the result is good.  You could change the TestCreateExtraView() method
so that the result is guaranteed to be wrapped.

+  EXPECT_TRUE(extra_view);
+  EXPECT_EQ("ImageView", std::string(extra_view->GetClassName()));

[catmullings, 2016/09/22 00:00:11]

Is this a sufficient way to check? The same question applies to my similar
checks in the tests below. 

Other ideas would be to check the: 
- Width/height of the resulting image, if I can dig up the expected dimensions. 
- Image actually points to IDR_OMNIBOX ... Though I don't see how to obtain this
from the ImageView nor ImageSkia classes.

[Devlin, 2016/09/26 20:13:09]

You should be able to use AreImagesEqual() to compare the image of the ImageView
with that of the resource, and they should match.  Similarly for below, you can
check the text of the link/label.

[catmullings, 2016/10/06 18:24:19]

Done.

+  CloseBubble();
+}
+
+TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewLinkedTextOnly) {
+  TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
+                                               ActionString());
+  ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text;
+
+  extra_view_info_linked_text.text =
+      l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN);
+  extra_view_info_linked_text.is_text_linked = true;
+  delegate.set_extra_view_info(extra_view_info_linked_text);
+
+  ShowBubble(&delegate);
+
+  views::View* extra_view = TestCreateExtraView();
+  EXPECT_TRUE(extra_view);
+  EXPECT_EQ("Link", std::string(extra_view->GetClassName()));
+  CloseBubble();
+}
+
+TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewLabelTextOnly) {
+  TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
+                                               ActionString());
+  ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info;
+
+  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);
+
+  ShowBubble(&delegate);
+
+  views::View* extra_view = TestCreateExtraView();
+  EXPECT_TRUE(extra_view);
+  EXPECT_EQ("Label", std::string(extra_view->GetClassName()));
+  CloseBubble();
+}
+
+TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewImageAndText) {
+  TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
+                                               ActionString());
+  ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info;
+  extra_view_info.resource_id = IDR_OMNIBOX_HTTPS_POLICY_WARNING;
+  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);
+
+  ShowBubble(&delegate);
+
+  views::View* extra_view = TestCreateExtraView();
+  EXPECT_TRUE(extra_view);
+  EXPECT_EQ("View", std::string(extra_view->GetClassName()));
+  EXPECT_EQ(2, extra_view->child_count());
+  CloseBubble();
+}