Hook up persist toggle UMA for PermissionRequestManager on Android

chrome/browser/permissions/permission_prompt_android.cc

 // Copyright 2016 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 "chrome/browser/permissions/permission_prompt_android.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
 #include "chrome/browser/permissions/permission_dialog_delegate.h"
 #include "chrome/browser/permissions/permission_request.h"
+#include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PermissionPromptAndroid::PermissionPromptAndroid(
     content::WebContents* web_contents)
     : web_contents_(web_contents), delegate_(nullptr) {

[raymes, 2017/06/15 04:41:36]

nit: initialize persist_

[Timothy Loh, 2017/06/15 06:00:58]

Done.

   DCHECK(web_contents);
 }
 
 PermissionPromptAndroid::~PermissionPromptAndroid() {}
 
 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionPromptAndroid::Show() {
@@ skipping 38 matching lines @@
   NOTREACHED() << "GetNativeWindow is not implemented";
   return nullptr;
 }
 
 void PermissionPromptAndroid::Closing() {
   if (delegate_)
     delegate_->Closing();
 }
 
 void PermissionPromptAndroid::TogglePersist(bool value) {
+  persist_ = value;
   if (delegate_)
     delegate_->TogglePersist(value);
 }
 
 void PermissionPromptAndroid::Accept() {
-  if (delegate_)
+  if (delegate_) {
+    if (ShouldShowPersistenceToggle()) {
+      for (const PermissionRequest* request : delegate_->Requests()) {
+        PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
+            request->GetContentSettingsType(), persist_);

[raymes, 2017/06/15 04:41:36]

Dom said there is a way to test the histograms from instrumentation tests using
RecordHistogram.getHistogramValueCountForTesting. It may be good to do that.

[Timothy Loh, 2017/06/15 06:00:58]

I added an assert in GeolocationTest.java, could do the same in MediaTest but
would require changing a bit more.

+      }
+    }
     delegate_->Accept();
+  }
 }
 
 void PermissionPromptAndroid::Deny() {
-  if (delegate_)
+  if (delegate_) {
+    if (ShouldShowPersistenceToggle()) {
+      for (const PermissionRequest* request : delegate_->Requests()) {
+        PermissionUmaUtil::PermissionPromptDeniedWithPersistenceToggle(
+            request->GetContentSettingsType(), persist_);
+      }
+    }
     delegate_->Deny();
+  }
 }
 
 size_t PermissionPromptAndroid::PermissionCount() const {
   return delegate_->Requests().size();
 }
 
 bool PermissionPromptAndroid::ShouldShowPersistenceToggle() const {
   for (const PermissionRequest* request : delegate_->Requests()) {
     if (!request->ShouldShowPersistenceToggle())
       return false;
@@ skipping 57 matching lines @@
     return GURL(chrome::kEnhancedPlaybackNotificationLearnMoreURL);
   }
   return GURL();
 }
 
 // static
 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
     content::WebContents* web_contents) {
   return base::MakeUnique<PermissionPromptAndroid>(web_contents);
 }