Strictly block blockable mixed subresources in subframes

chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc

 // Copyright 2014 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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 56 matching lines @@
 
   // Wait for reload
   content::TestNavigationObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents());
   observer.Wait();
 
   EXPECT_FALSE(GetActiveTabSpecificContentSettings()->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
 }
 
-// Tests that a MIXEDSCRIPT type ContentSettingBubbleModel works for an iframe.
+// Tests that a MIXEDSCRIPT type ContentSettingBubbleModel does not work
+// for an iframe (mixed script in iframes is never allowed and the mixed
+// content shield isn't shown for it).
 IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMixedScriptTest, Iframe) {
   GURL url(https_server_->GetURL(
       "files/content_setting_bubble/mixed_script_in_iframe.html"));
 
   ui_test_utils::NavigateToURL(browser(), url);
 
-  EXPECT_TRUE(GetActiveTabSpecificContentSettings()->IsContentBlocked(
-      CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
-
-  scoped_ptr<ContentSettingBubbleModel> model(
-      ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          browser()->content_setting_bubble_model_delegate(),
-          browser()->tab_strip_model()->GetActiveWebContents(),
-          browser()->profile(),
-          CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
-  model->OnCustomLinkClicked();
-
-  content::TestNavigationObserver observer(
-      browser()->tab_strip_model()->GetActiveWebContents());
-  observer.Wait();
-
+  // Blink does not ask the browser to handle mixed content in the case
+  // of active subresources in an iframe, so the content type should not
+  // be marked as blocked.
   EXPECT_FALSE(GetActiveTabSpecificContentSettings()->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
 }
 
 class ContentSettingBubbleModelMediaStreamTest : public InProcessBrowserTest {
  public:
   void ManageMediaStreamSettings(
       TabSpecificContentSettings::MicrophoneCameraState state) {
     // Open a tab for which we will invoke the media bubble.
     GURL url(ui_test_utils::GetTestUrl(
@@ skipping 47 matching lines @@
   EXPECT_EQ(GURL("chrome://settings/contentExceptions#media-stream-camera"),
             GetActiveTab()->GetLastCommittedURL());
 
   // The bubble for both media devices links to the the first section of the
   // default media content settings, which is the microphone section.
   ManageMediaStreamSettings(TabSpecificContentSettings::MICROPHONE_ACCESSED |
                             TabSpecificContentSettings::CAMERA_ACCESSED);
   EXPECT_EQ(GURL("chrome://settings/content#media-stream-mic"),
             GetActiveTab()->GetLastCommittedURL());
 }