Add GetUserMedia ETLD+1 rappor metrics.

third_party/WebKit/Source/core/frame/HostsUsingFeatures.cpp

 // Copyright 2015 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 "core/frame/HostsUsingFeatures.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/page/Page.h"
@@ skipping 57 matching lines @@
 }
 
 void HostsUsingFeatures::countName(Feature feature, const String& name)
 {
     auto result = m_valueByName.add(name, Value());
     result.storedValue->value.count(feature);
 }
 
 void HostsUsingFeatures::clear()
 {
-    m_hostAndValues.clear();
     m_valueByName.clear();
+    m_urlAndValues.clear();
 }
 
 void HostsUsingFeatures::documentDetached(Document& document)
 {
     HostsUsingFeatures::Value counter = document.HostsUsingFeaturesValue();
     if (counter.isEmpty())
         return;
 
     const KURL& url = document.url();
     if (!url.protocolIsInHTTPFamily())
         return;
 
-    m_hostAndValues.append(std::make_pair(url.host(), counter));
+    m_urlAndValues.append(std::make_pair(url, counter));
     document.HostsUsingFeaturesValue().clear();
     DCHECK(document.HostsUsingFeaturesValue().isEmpty());
 }
 
 void HostsUsingFeatures::updateMeasurementsAndClear()
 {
-    if (!m_hostAndValues.isEmpty())
+    if (!m_urlAndValues.isEmpty()) {
         recordHostToRappor();
+        recordETLDPlus1ToRappor();
+        m_urlAndValues.clear();
+    }
     if (!m_valueByName.isEmpty())
         recordNamesToRappor();
 }
 
 void HostsUsingFeatures::recordHostToRappor()
 {
-    DCHECK(!m_hostAndValues.isEmpty());
+    DCHECK(!m_urlAndValues.isEmpty());
 
     // Aggregate values by hosts.
     HashMap<String, HostsUsingFeatures::Value> aggregatedByHost;
-    for (const auto& hostAndValue : m_hostAndValues) {
-        DCHECK(!hostAndValue.first.isEmpty());
-        auto result = aggregatedByHost.add(hostAndValue.first, hostAndValue.second);
+    for (const auto& urlAndValue : m_urlAndValues) {
+        DCHECK(!urlAndValue.first.isEmpty());
+        auto result = aggregatedByHost.add(urlAndValue.first.host(), urlAndValue.second);
         if (!result.isNewEntry)
-            result.storedValue->value.aggregate(hostAndValue.second);
+            result.storedValue->value.aggregate(urlAndValue.second);
     }
 
     // Report to RAPPOR.
     for (auto& hostAndValue : aggregatedByHost)
         hostAndValue.value.recordHostToRappor(hostAndValue.key);
+}
 
-    m_hostAndValues.clear();
+void HostsUsingFeatures::recordETLDPlus1ToRappor()
+{
+    DCHECK(!m_urlAndValues.isEmpty());
+
+    // Aggregate values by URL.
+    HashMap<String, HostsUsingFeatures::Value> aggregatedByURL;
+    for (const auto& urlAndValue : m_urlAndValues) {
+        DCHECK(!urlAndValue.first.isEmpty());
+        auto result = aggregatedByURL.add(urlAndValue.first, urlAndValue.second);
+        if (!result.isNewEntry)
+            result.storedValue->value.aggregate(urlAndValue.second);
+    }
+
+    // Report to RAPPOR.
+    for (auto& urlAndValue : aggregatedByURL)
+        urlAndValue.value.recordETLDPlus1ToRappor(KURL(ParsedURLString, urlAndValue.key));
 }
 
 void HostsUsingFeatures::recordNamesToRappor()
 {
     DCHECK(!m_valueByName.isEmpty());
 
     for (auto& nameAndValue : m_valueByName)
         nameAndValue.value.recordNameToRappor(nameAndValue.key);
 
     m_valueByName.clear();
@@ skipping 15 matching lines @@
     if (get(Feature::EventPath))
         Platform::current()->recordRappor("WebComponents.EventPath", host);
     if (get(Feature::DeviceMotionInsecureHost))
         Platform::current()->recordRappor("PowerfulFeatureUse.Host.DeviceMotion.Insecure", host);
     if (get(Feature::DeviceOrientationInsecureHost))
         Platform::current()->recordRappor("PowerfulFeatureUse.Host.DeviceOrientation.Insecure", host);
     if (get(Feature::FullscreenInsecureHost))
         Platform::current()->recordRappor("PowerfulFeatureUse.Host.Fullscreen.Insecure", host);
     if (get(Feature::GeolocationInsecureHost))
         Platform::current()->recordRappor("PowerfulFeatureUse.Host.Geolocation.Insecure", host);
-    if (get(Feature::GetUserMediaInsecureHost))
-        Platform::current()->recordRappor("PowerfulFeatureUse.Host.GetUserMedia.Insecure", host);
-    if (get(Feature::GetUserMediaSecureHost))
-        Platform::current()->recordRappor("PowerfulFeatureUse.Host.GetUserMedia.Secure", host);
     if (get(Feature::ApplicationCacheManifestSelectInsecureHost))
         Platform::current()->recordRappor("PowerfulFeatureUse.Host.ApplicationCacheManifestSelect.Insecure", host);
     if (get(Feature::ApplicationCacheAPIInsecureHost))
         Platform::current()->recordRappor("PowerfulFeatureUse.Host.ApplicationCacheAPI.Insecure", host);
 }
 
 void HostsUsingFeatures::Value::recordNameToRappor(const String& name)
 {
     if (get(Feature::EventPath))
         Platform::current()->recordRappor("WebComponents.EventPath.Extensions", name);
 }
 
+void HostsUsingFeatures::Value::recordETLDPlus1ToRappor(const KURL& url)
+{
+    if (get(Feature::GetUserMediaInsecureHost))
+        Platform::current()->recordRapporURL("PowerfulFeatureUse.ETLDPlus1.GetUserMedia.Insecure", WebURL(url));
+    if (get(Feature::GetUserMediaSecureHost))
+        Platform::current()->recordRapporURL("PowerfulFeatureUse.ETLDPlus1.GetUserMedia.Secure", WebURL(url));
+}
+
 } // namespace blink