Convert AutoBlocker static class to KeyedService.

chrome/browser/permissions/permission_context_base.cc

 // Copyright 2014 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_context_base.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"

[dominickn, 2017/01/20 04:03:47]

#include "base/time/time.h"

[meredithl, 2017/01/20 04:21:33]

Done.

 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_request_impl.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
@@ skipping 34 matching lines @@
     const ContentSettingsType content_settings_type)
     : profile_(profile),
       permission_type_(permission_type),
       content_settings_type_(content_settings_type),
       safe_browsing_timeout_(kCheckUrlTimeoutMs),
       weak_factory_(this) {
 #if defined(OS_ANDROID)
   permission_queue_controller_.reset(new PermissionQueueController(
       profile_, permission_type_, content_settings_type_));
 #endif
-  PermissionDecisionAutoBlocker::UpdateFromVariations();
+  PermissionDecisionAutoBlocker::GetForProfile(profile_)
+      ->UpdateFromVariations();
 }
 
 PermissionContextBase::~PermissionContextBase() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 void PermissionContextBase::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
@@ skipping 42 matching lines @@
         requesting_origin, embedding_origin, content_settings_type_);
   }
 
   if (content_setting == CONTENT_SETTING_ALLOW ||
       content_setting == CONTENT_SETTING_BLOCK) {
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                         false /* persist */, content_setting);
     return;
   }
 
-  if (!db_manager_) {
-    safe_browsing::SafeBrowsingService* sb_service =
-        g_browser_process->safe_browsing_service();
-    if (sb_service)
-      db_manager_ = sb_service->database_manager();
-  }
-
   // Asynchronously check whether the origin should be blocked from making this
   // permission request. It may be on the Safe Browsing API blacklist, or it may
   // have been dismissed too many times in a row. If the origin is allowed to
   // request, that request will be made to ContinueRequestPermission().
-  PermissionDecisionAutoBlocker::UpdateEmbargoedStatus(
-      db_manager_, permission_type_, requesting_origin, web_contents,
-      safe_browsing_timeout_, profile_, base::Time::Now(),
+  PermissionDecisionAutoBlocker::GetForProfile(profile_)->UpdateEmbargoedStatus(
+      permission_type_, requesting_origin, web_contents, base::Time::Now(),
       base::Bind(&PermissionContextBase::ContinueRequestPermission,
                  weak_factory_.GetWeakPtr(), web_contents, id,
                  requesting_origin, embedding_origin, user_gesture, callback));
 }
 
 void PermissionContextBase::ContinueRequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback,
     bool permission_blocked) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (permission_blocked) {
     // TODO(meredithl): Add UMA metrics here.
     web_contents->GetMainFrame()->AddMessageToConsole(
         content::CONSOLE_MESSAGE_LEVEL_LOG,
         base::StringPrintf(
             "%s permission has been auto-blocked.",
             PermissionUtil::GetPermissionString(permission_type_).c_str()));
-    // Permission has been blacklisted, block the request.
+    // Permission has been automatically blocked.
     // TODO(meredithl): Consider setting the content setting and persisting

[dominickn, 2017/01/20 04:03:47]

You can remove this TODO :)

[meredithl, 2017/01/20 04:21:33]

Done.

     // the decision to block.
     callback.Run(CONTENT_SETTING_BLOCK);
     return;
   }
 
-  // Site is not blacklisted by Safe Browsing for the requested permission.
   PermissionUmaUtil::PermissionRequested(permission_type_, requesting_origin,
                                          embedding_origin, profile_);
 
   DecidePermission(web_contents, id, requesting_origin, embedding_origin,
                    user_gesture, callback);
 }
 
 ContentSetting PermissionContextBase::GetPermissionStatus(
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
   // If the permission has been disabled through Finch, block all requests.
   if (IsPermissionKillSwitchOn())
     return CONTENT_SETTING_BLOCK;
 
   if (IsRestrictedToSecureOrigins() &&
       !content::IsOriginSecure(requesting_origin)) {
     return CONTENT_SETTING_BLOCK;
   }
-
+  PermissionDecisionAutoBlocker* autoblocker =

[dominickn, 2017/01/20 04:03:47]

Nit: newline above this line. Also consider not having a variable and just
doing:

PermissionDecisionAutoBlocker::GetForProfile(profile_)->IsUnderEmbargo

[meredithl, 2017/01/20 04:21:33]

Done.

+      PermissionDecisionAutoBlockerFactory::GetForProfile(profile_);
   ContentSetting content_setting =
       GetPermissionStatusInternal(requesting_origin, embedding_origin);
   if (content_setting == CONTENT_SETTING_ASK &&
-      PermissionDecisionAutoBlocker::IsUnderEmbargo(
-          permission_type_, profile_, requesting_origin, base::Time::Now())) {
+      autoblocker->IsUnderEmbargo(permission_type_, requesting_origin,
+                                  base::Time::Now())) {
     return CONTENT_SETTING_BLOCK;
   }
   return content_setting;
 }
 
 void PermissionContextBase::ResetPermission(
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(requesting_origin, embedding_origin,
@@ skipping 110 matching lines @@
     } else if (content_setting == CONTENT_SETTING_BLOCK) {
       PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type,
                                           requesting_origin, profile_);
     } else {
       PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
                                              requesting_origin, profile_);
     }
   }
 
   if (content_setting == CONTENT_SETTING_DEFAULT &&
-      PermissionDecisionAutoBlocker::RecordDismissAndEmbargo(
-          requesting_origin, permission_type_, profile_, base::Time::Now())) {
+      PermissionDecisionAutoBlocker::GetForProfile(profile_)
+          ->RecordDismissAndEmbargo(requesting_origin, permission_type_,
+                                    base::Time::Now())) {
     // The permission has been embargoed, so it is blocked for this permission
     // request, but not persisted.
     content_setting = CONTENT_SETTING_BLOCK;
   }
 
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       persist, content_setting);
 }
 
 #if defined(OS_ANDROID)
@@ skipping 41 matching lines @@
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
   DCHECK(!requesting_origin.SchemeIsFile());
   DCHECK(!embedding_origin.SchemeIsFile());
 
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(requesting_origin, embedding_origin,
                                       content_settings_type_, std::string(),
                                       content_setting);
 }
-
-void PermissionContextBase::SetSafeBrowsingDatabaseManagerAndTimeoutForTest(
-    scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
-    int timeout) {
-  db_manager_ = db_manager;
-  safe_browsing_timeout_ = timeout;
-}