DialogBrowserTest implementation to invoke Content settings bubble dialogs.

chrome/browser/ui/content_settings/content_setting_image_model.cc

 // 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.
 
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 
 #include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
@@ skipping 57 matching lines @@
   void UpdateFromWebContents(WebContents* web_contents) override;
 
   ContentSettingBubbleModel* CreateBubbleModel(
       ContentSettingBubbleModel::Delegate* delegate,
       WebContents* web_contents,
       Profile* profile) override;
 
   bool ShouldRunAnimation(WebContents* web_contents) override;
   void SetAnimationHasRun(WebContents* web_contents) override;
 
+  ContentSettingsType GetContentType() override;
  private:
+  // This is cached here for testing purposes.
+  ContentSettingsType last_content_type_;
   DISALLOW_COPY_AND_ASSIGN(ContentSettingMediaImageModel);
 };
 
 class ContentSettingRPHImageModel : public ContentSettingSimpleImageModel {
  public:
   ContentSettingRPHImageModel();
 
   void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 class ContentSettingMIDISysExImageModel
     : public ContentSettingSimpleImageModel {
  public:
   ContentSettingMIDISysExImageModel();
 
   void UpdateFromWebContents(WebContents* web_contents) override;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentSettingMIDISysExImageModel);
 };
 
 namespace {
 
 struct ContentSettingsImageDetails {
   ContentSettingsType type;
   gfx::VectorIconId icon_id;
   int blocked_tooltip_id;
@@ skipping 40 matching lines @@
 }
 
 ContentSettingBubbleModel* ContentSettingSimpleImageModel::CreateBubbleModel(
     ContentSettingBubbleModel::Delegate* delegate,
     WebContents* web_contents,
     Profile* profile) {
   return ContentSettingBubbleModel::CreateContentSettingBubbleModel(
       delegate,
       web_contents,
       profile,
-      content_type());
+      GetContentType());

[tapted, 2017/02/03 00:35:39]

since this was claimed "for testing only" we shouldn't change it here.
content_type_, or keep the protected content_type() accessor if a subclass still
needs it

 }
 
 bool ContentSettingSimpleImageModel::ShouldRunAnimation(
     WebContents* web_contents) {
   if (!web_contents)
     return false;
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (!content_settings)
     return false;
 
-  return !content_settings->IsBlockageIndicated(content_type());
+  return !content_settings->IsBlockageIndicated(GetContentType());
 }
 
 void ContentSettingSimpleImageModel::SetAnimationHasRun(
     WebContents* web_contents) {
   if (!web_contents)
     return;
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (content_settings)
-    content_settings->SetBlockageHasBeenIndicated(content_type());
+    content_settings->SetBlockageHasBeenIndicated(GetContentType());
+}
+
+ContentSettingsType ContentSettingSimpleImageModel::GetContentType() {
+  return content_type_;
 }
 
 // static
 std::unique_ptr<ContentSettingImageModel>
 ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
     ContentSettingsType content_settings_type) {
   if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION)
     return base::MakeUnique<ContentSettingGeolocationImageModel>();
 
   if (content_settings_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS)
@@ skipping 12 matching lines @@
     ContentSettingsType content_type)
     : ContentSettingSimpleImageModel(content_type) {
 }
 
 void ContentSettingBlockedImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
   if (!web_contents)
     return;
 
-  const ContentSettingsType type = content_type();
+  const ContentSettingsType type = GetContentType();
   const ContentSettingsImageDetails* image_details = GetImageDetails(type);
   DCHECK(image_details) << "No entry for " << type << " in kImageDetails[].";
 
   int tooltip_id = image_details->blocked_tooltip_id;
   int explanation_id = image_details->blocked_explanatory_text_id;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile);
@@ skipping 81 matching lines @@
 
 // Media -----------------------------------------------------------------------
 
 ContentSettingMediaImageModel::ContentSettingMediaImageModel()
     : ContentSettingImageModel() {
 }
 
 void ContentSettingMediaImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
-
+  last_content_type_ = CONTENT_SETTINGS_TYPE_DEFAULT;
   if (!web_contents)
     return;
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (!content_settings)
     return;
   TabSpecificContentSettings::MicrophoneCameraState state =
       content_settings->GetMicrophoneCameraState();
 
@@ skipping 13 matching lines @@
                           gfx::VectorIconId::BLOCKED_BADGE);
     if (is_mic)
       id = is_cam ? IDS_MICROPHONE_CAMERA_BLOCKED : IDS_MICROPHONE_BLOCKED;
   } else {
     set_icon_by_vector_id(gfx::VectorIconId::VIDEOCAM,
                           gfx::VectorIconId::VECTOR_ICON_NONE);
     id = IDS_CAMERA_ACCESSED;
     if (is_mic)
       id = is_cam ? IDS_MICROPHONE_CAMERA_ALLOWED : IDS_MICROPHONE_ACCESSED;
   }
+  // During bubble dialog testing, only one of the 'devices' will be blocked
+  last_content_type_ = is_mic ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC :
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;

[tapted, 2017/02/03 00:35:39]

did `git cl format` do this? (looks different to how it normally format these,
but the format config files have been messed up lately)

[kylix_rd, 2017/02/03 18:55:03]

Yes, 'git cl format' did this.

   set_tooltip(l10n_util::GetStringUTF16(id));
   set_visible(true);
 }
 
 ContentSettingBubbleModel* ContentSettingMediaImageModel::CreateBubbleModel(
     ContentSettingBubbleModel::Delegate* delegate,
     WebContents* web_contents,
     Profile* profile) {
   return new ContentSettingMediaStreamBubbleModel(delegate,
                                                   web_contents,
@@ skipping 21 matching lines @@
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (content_settings) {
     content_settings->SetBlockageHasBeenIndicated(
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
     content_settings->SetBlockageHasBeenIndicated(
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   }
 }
 
+ContentSettingsType ContentSettingMediaImageModel::GetContentType() {
+    return last_content_type_;
+}
+

[tapted, 2017/02/03 00:35:39]

nit: remove blank line

+
 // Subresource Filter ----------------------------------------------------------
 
 ContentSettingSubresourceFilterImageModel::
     ContentSettingSubresourceFilterImageModel()
     : ContentSettingImageModel() {}
 
 void ContentSettingSubresourceFilterImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
 
@@ skipping 115 matching lines @@
   return gfx::Image(
       gfx::CreateVectorIconWithBadge(icon_id_, 16, icon_color, icon_badge_id_));
 }
 
 ContentSettingImageModel::ContentSettingImageModel()
     : is_visible_(false),
       icon_id_(gfx::VectorIconId::VECTOR_ICON_NONE),
       icon_badge_id_(gfx::VectorIconId::VECTOR_ICON_NONE),
       explanatory_string_id_(0) {}
 
+ContentSettingsType ContentSettingImageModel::GetContentType() {
+  return CONTENT_SETTINGS_TYPE_DEFAULT;
+}
+
 // static
 std::vector<std::unique_ptr<ContentSettingImageModel>>
 ContentSettingImageModel::GenerateContentSettingImageModels() {
   std::vector<std::unique_ptr<ContentSettingImageModel>> result;
 
   // The ordering of the models here influences the order in which icons are
   // shown in the omnibox.
   result.push_back(base::MakeUnique<ContentSettingBlockedImageModel>(
       CONTENT_SETTINGS_TYPE_COOKIES));
   result.push_back(base::MakeUnique<ContentSettingBlockedImageModel>(
@@ skipping 22 matching lines @@
 
 #if defined(OS_MACOSX)
 bool ContentSettingImageModel::UpdateFromWebContentsAndCheckIfIconChanged(
     content::WebContents* web_contents) {
   gfx::VectorIconId old_icon = icon_id_;
   gfx::VectorIconId old_badge_icon = icon_badge_id_;
   UpdateFromWebContents(web_contents);
   return old_icon != icon_id_ && old_badge_icon != icon_badge_id_;
 }
 #endif