Use ContentSetting in chrome/ instead of PermissionStatus

chrome/browser/notifications/platform_notification_service_impl.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/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 209 matching lines @@
           NotifierStateTrackerFactory::GetForProfile(profile);
       DCHECK(notifier_state_tracker);
 
       NotifierId notifier_id(NotifierId::APPLICATION, extension->id());
       if (notifier_state_tracker->IsNotifierEnabled(notifier_id))
         return blink::mojom::PermissionStatus::GRANTED;
     }
   }
 #endif
 
-  return PermissionManager::Get(profile)->GetPermissionStatus(
+  ContentSetting setting = PermissionManager::Get(profile)->GetPermissionStatus(
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin);
+  if (setting == CONTENT_SETTING_ALLOW)
+    return blink::mojom::PermissionStatus::GRANTED;
+  if (setting == CONTENT_SETTING_ASK)
+    return blink::mojom::PermissionStatus::ASK;
+  DCHECK_EQ(setting, CONTENT_SETTING_BLOCK);

[raymes, 2017/02/28 01:37:34]

nit: swap the param order

[Timothy Loh, 2017/02/28 04:02:46]

Done.

+  return blink::mojom::PermissionStatus::DENIED;
 }
 
 blink::mojom::PermissionStatus
 PlatformNotificationServiceImpl::CheckPermissionOnIOThread(
     content::ResourceContext* resource_context,
     const GURL& origin,
     int render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
@@ skipping 270 matching lines @@
   }
 #endif
 
   return base::string16();
 }
 
 void PlatformNotificationServiceImpl::SetNotificationDisplayServiceForTesting(
     NotificationDisplayService* display_service) {
   test_display_service_ = display_service;
 }