Log CookieControls UserActions from controller

Log these UserActions from the controller, so they get logged on
Android as well.

Bug: 1040091
Change-Id: I2f938d54c376b88d020e2a576d7dd2348c1b64ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063130Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Auto-Submit: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742682}

chrome/browser/ui/cookie_controls/cookie_controls_controller.cc

@@ -7,6 +7,8 @@
 
 #include <memory>
 #include "base/bind.h"
+#include "base/metrics/user_metrics.h"
+#include "base/metrics/user_metrics_action.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ -20,6 +22,8 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 
+using base::UserMetricsAction;
+
 CookieControlsController::CookieControlsController(
     content::WebContents* web_contents) {
   DCHECK(web_contents);
@@ -76,9 +80,11 @@ CookieControlsController::Status CookieControlsController::GetStatus(
 void CookieControlsController::OnCookieBlockingEnabledForSite(
     bool block_third_party_cookies) {
   if (block_third_party_cookies) {
+    base::RecordAction(UserMetricsAction("CookieControls.Bubble.TurnOn"));
     should_reload_ = false;
     cookie_settings_->ResetThirdPartyCookieSetting(GetWebContents()->GetURL());
   } else {
+    base::RecordAction(UserMetricsAction("CookieControls.Bubble.TurnOff"));
     should_reload_ = true;
     cookie_settings_->SetThirdPartyCookieSetting(
         GetWebContents()->GetURL(), ContentSetting::CONTENT_SETTING_ALLOW);

chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc

@@ -272,12 +272,10 @@ void CookieControlsBubbleView::WindowClosing() {
 
 void CookieControlsBubbleView::OnDialogAccepted() {
   if (intermediate_step_ == IntermediateStep::kTurnOffButton) {
-    base::RecordAction(UserMetricsAction("CookieControls.Bubble.TurnOff"));
     controller_->OnCookieBlockingEnabledForSite(false);
   } else {
     DCHECK_EQ(status_, CookieControlsController::Status::kDisabledForSite);
     DCHECK_EQ(intermediate_step_, IntermediateStep::kNone);
-    base::RecordAction(UserMetricsAction("CookieControls.Bubble.TurnOn"));
     controller_->OnCookieBlockingEnabledForSite(true);
   }
 }