Have Permission{Manager,Service} use Origin.

chrome/browser/media/media_stream_device_permission_context_unittest.cc

Index: chrome/browser/media/media_stream_device_permission_context_unittest.cc
diff --git a/chrome/browser/media/media_stream_device_permission_context_unittest.cc b/chrome/browser/media/media_stream_device_permission_context_unittest.cc
index 9082e45079542c0256dacd469abdc9eb0daca03d..329f6e257d9bac164fd2d120c697a06d68bc908f 100644
--- a/chrome/browser/media/media_stream_device_permission_context_unittest.cc
+++ b/chrome/browser/media/media_stream_device_permission_context_unittest.cc
@@ -51,8 +51,8 @@ class MediaStreamDevicePermissionContextTests
 
   void TestInsecureQueryingUrl(ContentSettingsType permission_type) {
     TestPermissionContext permission_context(profile(), permission_type);
-    GURL insecure_url("http://www.example.com");
-    GURL secure_url("https://www.example.com");
+    const GURL insecure_url("http://www.example.com");
+    const GURL secure_url("https://www.example.com");
 
     // Check that there is no saved content settings.
     EXPECT_EQ(CONTENT_SETTING_ASK,
@@ -74,10 +74,12 @@ class MediaStreamDevicePermissionContextTests
                                       permission_type,
                                       std::string()));
 
+    const url::Origin insecure_origin(insecure_url);
+    const url::Origin secure_origin(secure_url);
     EXPECT_EQ(CONTENT_SETTING_ASK, permission_context.GetPermissionStatus(
-                                       insecure_url, insecure_url));
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-              permission_context.GetPermissionStatus(insecure_url, secure_url));
+                                       insecure_origin, insecure_origin));
+    EXPECT_EQ(CONTENT_SETTING_ASK, permission_context.GetPermissionStatus(
+                                       insecure_origin, secure_origin));
   }
 
   void TestSecureQueryingUrl(ContentSettingsType permission_type) {
@@ -92,8 +94,9 @@ class MediaStreamDevicePermissionContextTests
                                       permission_type,
                                       std::string()));
 
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-              permission_context.GetPermissionStatus(secure_url, secure_url));
+    const url::Origin secure_origin(secure_url);
+    EXPECT_EQ(CONTENT_SETTING_ASK, permission_context.GetPermissionStatus(
+                                       secure_origin, secure_origin));
   }
 
  private: