Add UseCounters for the types of mixed content we currently don't block.

In order to evaluate when we can start dropping support for passive
mixed content, this patch adds counters to ResourceFetcher for the four
resource types we currently don't block: images, media, tracks, and raw.
This patch also drops the 'MixedContentFont' enum, as we now consider
that active content.

Review URL: https://codereview.chromium.org/312253003

git-svn-id: svn://svn.chromium.org/blink/trunk@175557 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

@@ -462,8 +462,28 @@ bool ResourceFetcher::checkInsecureContent(Resource::Type type, const KURL& url,
             Frame* top = f->tree().top();
             if (!toLocalFrame(top)->loader().mixedContentChecker()->canDisplayInsecureContent(toLocalFrame(top)->document()->securityOrigin(), url))
                 return false;
-            if (type == Resource::Font && MixedContentChecker::isMixedContent(toLocalFrame(top)->document()->securityOrigin(), url))
-                UseCounter::count(toLocalFrame(top)->document(), UseCounter::MixedContentFont);
+            if (MixedContentChecker::isMixedContent(toLocalFrame(top)->document()->securityOrigin(), url)) {
+                switch (type) {
+                case Resource::TextTrack:
+                    UseCounter::count(toLocalFrame(top)->document(), UseCounter::MixedContentTextTrack);
+                    break;
+
+                case Resource::Raw:
+                    UseCounter::count(toLocalFrame(top)->document(), UseCounter::MixedContentRaw);
+                    break;
+
+                case Resource::Image:
+                    UseCounter::count(toLocalFrame(top)->document(), UseCounter::MixedContentImage);
+                    break;
+
+                case Resource::Media:
+                    UseCounter::count(toLocalFrame(top)->document(), UseCounter::MixedContentMedia);
+                    break;
+
+                default:
+                    ASSERT_NOT_REACHED();
+                }
+            }
         }
     } else {
         ASSERT(treatment == TreatAsAlwaysAllowedContent);

third_party/WebKit/Source/core/frame/UseCounter.h

@@ -421,7 +421,6 @@ public:
         PostMessageFromInsecureToSecure = 420,
         DocumentExitPointerLock = 421,
         DocumentPointerLockElement = 422,
-        MixedContentFont = 423,
         PrefixedCursorZoomIn = 424,
         PrefixedCursorZoomOut = 425,
         CSSCharsetRuleEncoding = 426,
@@ -434,6 +433,11 @@ public:
         FocusInOutEvent = 433,
         MouseEventMovementX = 434,
         MouseEventMovementY = 435,
+        MixedContentTextTrack = 436,
+        MixedContentRaw = 437,
+        MixedContentImage = 438,
+        MixedContentMedia = 439,
+
         // Add new features immediately above this line. Don't change assigned
         // numbers of any item, and don't reuse removed slots.
         // Also, run update_use_counter_feature_enum.py in chromium/src/tools/metrics/histograms/