Have Permission{Manager,Service} use Origin.

chrome/browser/media/media_stream_device_permission_context_unittest.cc

 // Copyright 2015 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/media/media_stream_device_permission_context.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 33 matching lines @@
 
 // TODO(raymes): many tests in MediaStreamDevicesControllerTest should be
 // converted to tests in this file.
 class MediaStreamDevicePermissionContextTests
     : public ChromeRenderViewHostTestHarness {
  protected:
   MediaStreamDevicePermissionContextTests() = default;
 
   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,
               HostContentSettingsMapFactory::GetForProfile(profile())
                   ->GetContentSetting(insecure_url.GetOrigin(),
                                       insecure_url.GetOrigin(),
                                       permission_type,
                                       std::string()));
     EXPECT_EQ(CONTENT_SETTING_ASK,
               HostContentSettingsMapFactory::GetForProfile(profile())
                   ->GetContentSetting(secure_url.GetOrigin(),
                                       insecure_url.GetOrigin(),
                                       permission_type,
                                       std::string()));
     EXPECT_EQ(CONTENT_SETTING_ASK,
               HostContentSettingsMapFactory::GetForProfile(profile())
                   ->GetContentSetting(insecure_url.GetOrigin(),
                                       secure_url.GetOrigin(),
                                       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) {
     TestPermissionContext permission_context(profile(), permission_type);
     GURL secure_url("https://www.example.com");
 
     // Check that there is no saved content settings.
     EXPECT_EQ(CONTENT_SETTING_ASK,
               HostContentSettingsMapFactory::GetForProfile(profile())
                   ->GetContentSetting(secure_url.GetOrigin(),
                                       secure_url.GetOrigin(),
                                       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:
   // ChromeRenderViewHostTestHarness:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined(OS_ANDROID)
     InfoBarService::CreateForWebContents(web_contents());
 #else
     PermissionBubbleManager::CreateForWebContents(web_contents());
@@ skipping 17 matching lines @@
 
 // MEDIASTREAM_MIC permission status should be ask for Secure origin.
 TEST_F(MediaStreamDevicePermissionContextTests, TestMicSecureQueryingUrl) {
   TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
 }
 
 // MEDIASTREAM_CAMERA permission status should be ask for Secure origin.
 TEST_F(MediaStreamDevicePermissionContextTests, TestCameraSecureQueryingUrl) {
   TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
 }