Fix bug in one time permissions metrics

Fixed issue where metrics were recorded as GEOLOCATION permission regardless what the permission was.

Bug: 1119738
Change-Id: Ib0f5d372727a26b9294536a03928a2d79305dea6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2438369
Commit-Queue: Ravjit Singh Uppal <ravjit@chromium.org>
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811775}

chrome/browser/content_settings/page_specific_content_settings_unittest.cc

@@ -61,6 +61,10 @@ TEST_F(PageSpecificContentSettingsTest, HistogramTest) {
   // Count should stay same even after multiple usage of permission
   histograms.ExpectTotalCount(kGeolocationHistogramName, 1);
 
+  content_settings->OnContentAllowed(ContentSettingsType::NOTIFICATIONS);
+  // Count should stay same even if a different permission is used
+  histograms.ExpectTotalCount(kGeolocationHistogramName, 1);
+
   PageSpecificContentSettings::MicrophoneCameraState microphone_accessed =
       PageSpecificContentSettings::MICROPHONE_ACCESSED |
       PageSpecificContentSettings::CAMERA_ACCESSED |
@@ -90,6 +94,10 @@ TEST_F(PageSpecificContentSettingsTest, HistogramTest) {
   // Count should stay same even after multiple usage of permission
   histograms.ExpectTotalCount(kMicrophoneHistogramName, 1);
   histograms.ExpectTotalCount(kCameraHistogramName, 1);
+
+  // Count should stay same even if a different permission is used
+  histograms.ExpectTotalCount(kMicrophoneHistogramName, 1);
+  histograms.ExpectTotalCount(kCameraHistogramName, 1);
 }
 
 }  // namespace content_settings

components/content_settings/browser/page_specific_content_settings.cc

@@ -577,7 +577,7 @@ void PageSpecificContentSettings::OnContentAllowed(ContentSettingsType type) {
   if (!status.allowed) {
     status.allowed = true;
     access_changed = true;
-    delegate_->OnContentAllowed(ContentSettingsType::GEOLOCATION);
+    delegate_->OnContentAllowed(type);
   }
 
   if (access_changed)