Make the PermissionDecisionAutoBlocker API consistent.

chrome/browser/permissions/permission_blacklist_client.cc

 // Copyright 2017 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_blacklist_client.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 // static
 void PermissionBlacklistClient::CheckSafeBrowsingBlacklist(
+    content::WebContents* web_contents,
     scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
+    const GURL& request_origin,
     ContentSettingsType content_settings_type,
-    const GURL& request_origin,
-    content::WebContents* web_contents,
     int timeout,
     base::Callback<void(bool)> callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  new PermissionBlacklistClient(db_manager, content_settings_type,
-                                request_origin, web_contents, timeout,
-                                callback);
+  new PermissionBlacklistClient(web_contents, db_manager, request_origin,
+                                content_settings_type, timeout, callback);
 }
 
 PermissionBlacklistClient::PermissionBlacklistClient(
+    content::WebContents* web_contents,
     scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
+    const GURL& request_origin,
     ContentSettingsType content_settings_type,
-    const GURL& request_origin,
-    content::WebContents* web_contents,
     int timeout,
     base::Callback<void(bool)> callback)
     : content::WebContentsObserver(web_contents),
       db_manager_(db_manager),
       content_settings_type_(content_settings_type),
       callback_(callback),
       timeout_(timeout),
       is_active_(true) {
   // Balanced by a call to Release() in EvaluateBlacklistResultOnUiThread().
   AddRef();
@@ skipping 58 matching lines @@
 
   if (is_active_)
     callback_.Run(response);
   Release();
 }
 
 void PermissionBlacklistClient::WebContentsDestroyed() {
   is_active_ = false;
   Observe(nullptr);
 }