Remove MediaSettingChangedInfobar and show latest state in bubble

chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ skipping 216 matching lines @@
                 url,
                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
                 std::string()));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 url,
                 url,
                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
                 std::string()));
 
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  infobar_service->RemoveInfoBar(infobar_service->infobar_at(0));
+  {
+    scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(

[Peter Kasting, 2014/09/22 23:11:23]

Nit: Would it make sense to make this added code its own test instead of tacking
it onto the previous one?  If it didn't result in extra setup boilerplate or
something, it would mean shorter, more focused individual tests.

[robwu, 2014/09/24 00:03:04]

Done. I have added two tests. One of them is for the media permission changes,
the other one is for media menu settings (which was not covered by any test
before this patch).

+        ContentSettingBubbleModel::CreateContentSettingBubbleModel(
+           NULL, web_contents(), profile(),
+           CONTENT_SETTINGS_TYPE_MEDIASTREAM));
+    const ContentSettingBubbleModel::BubbleContent& bubble_content =
+        content_setting_bubble_model->bubble_content();
+    // Test that the reload hint is displayed.
+    EXPECT_FALSE(bubble_content.custom_link_enabled);
+    EXPECT_EQ(bubble_content.custom_link, l10n_util::GetStringUTF8(
+            IDS_MEDIASTREAM_SETTING_CHANGED_INFOBAR_MESSAGE));
+
+    EXPECT_EQ(0, bubble_content.radio_group.default_item);
+    // Restore the radio setting (to block).
+    content_setting_bubble_model->OnRadioClicked(1);
+  }
+  // Test that the media settings were changed again.
+  EXPECT_EQ(CONTENT_SETTING_BLOCK,
+            host_content_settings_map->GetContentSetting(
+                url,
+                url,
+                CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+                std::string()));
+  EXPECT_EQ(CONTENT_SETTING_BLOCK,
+            host_content_settings_map->GetContentSetting(
+                url,
+                url,
+                CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+                std::string()));
+
+  {
+    scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
+        ContentSettingBubbleModel::CreateContentSettingBubbleModel(
+           NULL, web_contents(), profile(),
+           CONTENT_SETTINGS_TYPE_MEDIASTREAM));
+    const ContentSettingBubbleModel::BubbleContent& bubble_content =
+        content_setting_bubble_model->bubble_content();
+    // Test that the reload hint is not displayed any more.
+    EXPECT_FALSE(bubble_content.custom_link_enabled);
+    EXPECT_TRUE(bubble_content.custom_link.empty());
+
+    EXPECT_EQ(1, bubble_content.radio_group.default_item);
+  }
 }
 
 TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
   // Required to break dependency on BrowserMainLoop.
   MediaCaptureDevicesDispatcher::GetInstance()->
       DisableDeviceEnumerationForTesting();
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   std::string request_host = "google.com";
@@ skipping 411 matching lines @@
   {
     ProtocolHandler handler = registry.GetHandlerFor("mailto");
     ASSERT_FALSE(handler.IsEmpty());
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               content_settings->pending_protocol_handler_setting());
     EXPECT_FALSE(registry.IsIgnored(test_handler));
   }
 
   registry.Shutdown();
 }