Use ContentSetting in chrome/ instead of PermissionStatus

chrome/browser/notifications/platform_notification_service_interactive_uitest.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 <memory>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 144 matching lines @@
 
 void PlatformNotificationServiceBrowserTest::TearDown() {
   service()->SetNotificationDisplayServiceForTesting(nullptr);
 }
 
 void PlatformNotificationServiceBrowserTest::
     GrantNotificationPermissionForTest() const {
   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));
 }
 
 void PlatformNotificationServiceBrowserTest::NavigateToTestPage(
     const std::string& path) const {
   ui_test_utils::NavigateToURL(browser(), https_server_->GetURL(path));
 }
 
@@ skipping 286 matching lines @@
 // TODO(felt): This DCHECKs when bubbles are enabled, when the file_url is
 // persisted. crbug.com/502057
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        DISABLED_CheckFilePermissionNotGranted) {
   // This case should succeed because a normal page URL is used.
   std::string script_result;
 
   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;
   EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &dir_source_root));
   base::FilePath full_file_path =
       dir_source_root.Append(server_root()).AppendASCII(kTestFileName);
   GURL file_url(net::FilePathToFileURL(full_file_path));
 
   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 "
       << "from sending their origin from Blink; if so you need to update the "
       << "display function for notification origins to show the file path.";
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        DataUrlAsNotificationImage) {
   ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
@@ skipping 273 matching lines @@
       RunScript("DisplayPersistentAllOptionsNotification()", &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
   const Notification& notification = ui_manager()->GetNotificationAt(0);
 
   // Since the kNotificationContentImage kill switch has disabled images, the
   // notification should be shown without an image.
   EXPECT_TRUE(notification.image().IsEmpty());
 }