Use ContentSetting in chrome/ instead of PermissionStatus

chrome/browser/notifications/platform_notification_service_interactive_uitest.cc

Index: chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
diff --git a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
index f99ba225cd845fe62d10522596e8b8d3035b3139..b287778076a9cccb07cc05eed43a91d635500375 100644
--- a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
+++ b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
@@ -162,7 +162,7 @@ void PlatformNotificationServiceBrowserTest::
   GURL origin = TestPageUrl().GetOrigin();
 
   DesktopNotificationProfileUtil::GrantPermission(browser()->profile(), origin);
-  ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED,
+  ASSERT_EQ(CONTENT_SETTING_ALLOW,
             PermissionManager::Get(browser()->profile())
                 ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                                       origin, origin));
@@ -469,16 +469,16 @@ IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
   PermissionManager* permission_manager =
       PermissionManager::Get(browser()->profile());
 
-  EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
-            permission_manager->GetPermissionStatus(
-                CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(),
-                TestPageUrl()));
+  EXPECT_EQ(
+      CONTENT_SETTING_ASK,
+      permission_manager->GetPermissionStatus(
+          CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(), TestPageUrl()));
 
   RequestAndAcceptPermission();
-  EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED,
-            permission_manager->GetPermissionStatus(
-                CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(),
-                TestPageUrl()));
+  EXPECT_EQ(
+      CONTENT_SETTING_ASK,

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

CONTENT_SETTING_ALLOW

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

Fixed

+      permission_manager->GetPermissionStatus(
+          CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(), TestPageUrl()));
 
   // This case should fail because a file URL is used.
   base::FilePath dir_source_root;
@@ -489,12 +489,12 @@ IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
 
   ui_test_utils::NavigateToURL(browser(), file_url);
 
-  EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
+  EXPECT_EQ(CONTENT_SETTING_ASK,
             permission_manager->GetPermissionStatus(
                 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, file_url, file_url));
 
   RequestAndAcceptPermission();
-  EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
+  EXPECT_EQ(CONTENT_SETTING_ASK,
             permission_manager->GetPermissionStatus(
                 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, file_url, file_url))
       << "If this test fails, you may have fixed a bug preventing file origins "