[WIP][POC]

chrome/browser/permissions/permission_context_base.cc

Index: chrome/browser/permissions/permission_context_base.cc
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc
index a954190af0ea457baa002ec24bd40349daa44b1f..117ca4819d690de22dc8896fd912599b51d92755 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -12,6 +12,8 @@
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.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"
 #include "chrome/browser/profiles/profile.h"
@@ -27,9 +29,6 @@
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/permissions/permission_queue_controller.h"
-#else
-#include "chrome/browser/permissions/permission_request_impl.h"
-#include "chrome/browser/permissions/permission_request_manager.h"
 #endif
 
 // static
@@ -47,10 +46,11 @@ PermissionContextBase::PermissionContextBase(
       permission_type_(permission_type),
       content_settings_type_(content_settings_type),
       weak_factory_(this) {
-#if defined(OS_ANDROID)
-  permission_queue_controller_.reset(new PermissionQueueController(
-      profile_, permission_type_, content_settings_type_));
-#endif
+// #if defined(OS_ANDROID)
+  // TODO: add runtime flag.
+  // permission_queue_controller_.reset(new PermissionQueueController(
+  //     profile_, permission_type_, content_settings_type_));
+// #endif
 }
 
 PermissionContextBase::~PermissionContextBase() {
@@ -147,16 +147,16 @@ void PermissionContextBase::CancelPermissionRequest(
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-#if defined(OS_ANDROID)
-  GetQueueController()->CancelInfoBarRequest(id);
-#else
+// #if defined(OS_ANDROID)
+//   GetQueueController()->CancelInfoBarRequest(id);
+// #else
   PermissionRequest* cancelling = pending_requests_.get(id.ToString());
   if (cancelling != NULL && web_contents != NULL &&
       PermissionRequestManager::FromWebContents(web_contents) != NULL) {
     PermissionRequestManager::FromWebContents(web_contents)
         ->CancelRequest(cancelling);
   }
-#endif
+// #endif
 }
 
 void PermissionContextBase::DecidePermission(
@@ -167,7 +167,9 @@ void PermissionContextBase::DecidePermission(
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-#if !defined(OS_ANDROID)
+// #if !defined(OS_ANDROID)
+
+LOG(INFO) << "REQUESTING PERMISSION";
   PermissionRequestManager* permission_request_manager =
       PermissionRequestManager::FromWebContents(web_contents);
   // TODO(felt): sometimes |permission_request_manager| is null. This check is
@@ -187,16 +189,16 @@ void PermissionContextBase::DecidePermission(
       pending_requests_.add(id.ToString(), std::move(request_ptr)).second;
   DCHECK(inserted) << "Duplicate id " << id.ToString();
   permission_request_manager->AddRequest(request);
-#else
-  GetQueueController()->CreateInfoBarRequest(
-      id, requesting_origin, embedding_origin,
-      base::Bind(&PermissionContextBase::PermissionDecided,
-                 weak_factory_.GetWeakPtr(), id, requesting_origin,
-                 embedding_origin, callback,
-                 // the queue controller takes care of persisting the
-                 // permission
-                 false));
-#endif
+// #else
+//   GetQueueController()->CreateInfoBarRequest(
+//       id, requesting_origin, embedding_origin,
+//       base::Bind(&PermissionContextBase::PermissionDecided,
+//                  weak_factory_.GetWeakPtr(), id, requesting_origin,
+//                  embedding_origin, callback,
+//                  // the queue controller takes care of persisting the
+//                  // permission
+//                  false));
+// #endif
 }
 
 void PermissionContextBase::PermissionDecided(
@@ -226,11 +228,11 @@ void PermissionContextBase::PermissionDecided(
                       persist, content_setting);
 }
 
-#if defined(OS_ANDROID)
-PermissionQueueController* PermissionContextBase::GetQueueController() {
-  return permission_queue_controller_.get();
-}
-#endif
+// #if defined(OS_ANDROID)
+// PermissionQueueController* PermissionContextBase::GetQueueController() {
+//   return permission_queue_controller_.get();
+// }
+// #endif
 
 Profile* PermissionContextBase::profile() const {
   return profile_;