Remove PermissionContext factories

chrome/browser/push_messaging/push_messaging_permission_context.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/push_messaging/push_messaging_permission_context.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/notifications/notification_permission_context.h"
-#include "chrome/browser/notifications/notification_permission_context_factory.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/origin_util.h"
 
@@ skipping 14 matching lines @@
   // TODO(johnme): This is likely to break assumptions made elsewhere, so we
   // should try to remove this quirk.
 #if defined(ENABLE_NOTIFICATIONS)
   if (requesting_origin != embedding_origin)
     return CONTENT_SETTING_BLOCK;
 
   ContentSetting push_content_setting =
       PermissionContextBase::GetPermissionStatus(requesting_origin,
                                                  embedding_origin);
 
-  NotificationPermissionContext* notification_context =
-      NotificationPermissionContextFactory::GetForProfile(profile_);
-  DCHECK(notification_context);
+  PermissionContextBase* notification_permission_context =
+      PermissionManagerFactory::GetForProfile(profile_)->GetPermissionContext(
+          content::PermissionType::NOTIFICATIONS);
 
   ContentSetting notifications_permission =
-      notification_context->GetPermissionStatus(requesting_origin,
-                                                embedding_origin);
+      notification_permission_context->GetPermissionStatus(requesting_origin,
+                                                           embedding_origin);

[mlamouri (slow - plz ping), 2016/04/11 14:06:06]

As above, I think we can abstract out the PermissionContext and directly use the
PermissionManager.

[raymes, 2016/04/12 07:44:54]

Done.

 
   if (notifications_permission == CONTENT_SETTING_BLOCK ||
       push_content_setting == CONTENT_SETTING_BLOCK) {
     return CONTENT_SETTING_BLOCK;
   }
   if (notifications_permission == CONTENT_SETTING_ASK)
     return CONTENT_SETTING_ASK;
 
   DCHECK(push_content_setting == CONTENT_SETTING_ALLOW ||
          push_content_setting == CONTENT_SETTING_ASK);
@@ skipping 20 matching lines @@
     const GURL& embedding_origin,
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 #if defined(ENABLE_NOTIFICATIONS)
   if (requesting_origin != embedding_origin) {
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                         false /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
 
-  NotificationPermissionContext* notification_context =
-      NotificationPermissionContextFactory::GetForProfile(profile_);
-  DCHECK(notification_context);
+  PermissionContextBase* notification_permission_context =
+      PermissionManagerFactory::GetForProfile(profile_)->GetPermissionContext(
+          content::PermissionType::NOTIFICATIONS);
 
-  notification_context->RequestPermission(
+  notification_permission_context->RequestPermission(

[mlamouri (slow - plz ping), 2016/04/11 14:06:05]

ditto

[raymes, 2016/04/12 07:44:54]

Done.

       web_contents, id, requesting_origin,
       base::Bind(&PushMessagingPermissionContext::DecidePushPermission,
                  weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin,
                  embedding_origin, callback));
 #else
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       false /* persist */, CONTENT_SETTING_BLOCK);
 #endif
 }
 
@@ skipping 26 matching lines @@
     DVLOG(1) << "Notification permission has not been granted.";
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                         false /* persist */, notification_content_setting);
     return;
   }
 
   PermissionUmaUtil::PermissionGranted(permission_type(), requesting_origin);
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       true /* persist */, CONTENT_SETTING_ALLOW);
 }