Have Permission{Manager,Service} use Origin.

chrome/browser/notifications/platform_notification_service_browsertest.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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 377 matching lines @@
 // 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;
 
   NotificationPermissionContext* permission_context =
       NotificationPermissionContextFactory::GetForProfile(browser()->profile());
   ASSERT_TRUE(permission_context);
 
+  const url::Origin origin(TestPageUrl());
   EXPECT_EQ(CONTENT_SETTING_ASK,
-            permission_context->GetPermissionStatus(TestPageUrl(),
-                                                    TestPageUrl()));
+            permission_context->GetPermissionStatus(origin, origin));
 
   RequestAndAcceptPermission();
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            permission_context->GetPermissionStatus(TestPageUrl(),
-                                                    TestPageUrl()));
+            permission_context->GetPermissionStatus(origin, origin));
 
   // 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));
+  const GURL file_url(net::FilePathToFileURL(full_file_path));
+  const url::Origin file_origin(file_url);
 
   ui_test_utils::NavigateToURL(browser(), file_url);
 
   EXPECT_EQ(CONTENT_SETTING_ASK,
-            permission_context->GetPermissionStatus(file_url, file_url));
+            permission_context->GetPermissionStatus(file_origin, file_origin));
 
   RequestAndAcceptPermission();
   EXPECT_EQ(CONTENT_SETTING_ASK,
-            permission_context->GetPermissionStatus(file_url, file_url))
+            permission_context->GetPermissionStatus(file_origin, file_origin))
       << "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());
 
   std::string script_result;
@@ skipping 46 matching lines @@
   EXPECT_EQ("actionTitle2", base::UTF16ToUTF8(notification.buttons()[1].title));
 
   notification.delegate()->ButtonClick(0);
   ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
   EXPECT_EQ("action_button_click actionId1", script_result);
 
   notification.delegate()->ButtonClick(1);
   ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
   EXPECT_EQ("action_button_click actionId2", script_result);
 }