Have Permission{Manager,Service} use Origin.

chrome/browser/media/midi_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/midi_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 38 matching lines @@
     return tab_context_updated_;
   }
 
   void TrackPermissionDecision(ContentSetting content_setting) {
     permission_set_ = true;
     permission_granted_ = content_setting == CONTENT_SETTING_ALLOW;
   }
 
  protected:
   void UpdateTabContext(const PermissionRequestID& id,
-                        const GURL& requesting_origin,
+                        const url::Origin& requesting_origin,
                         bool allowed) override {
     tab_context_updated_ = true;
   }
 
  private:
    bool permission_set_;
    bool permission_granted_;
    bool tab_context_updated_;
 };
 
@@ skipping 13 matching lines @@
     PermissionBubbleManager::CreateForWebContents(web_contents());
 #endif
   }
 
   DISALLOW_COPY_AND_ASSIGN(MidiPermissionContextTests);
 };
 
 // Web MIDI permission should be denied for insecure origin.
 TEST_F(MidiPermissionContextTests, TestInsecureRequestingUrl) {
   TestPermissionContext permission_context(profile());
-  GURL url("http://www.example.com");
+  const GURL url("http://www.example.com");
   content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
   const PermissionRequestID id(
       web_contents()->GetRenderProcessHost()->GetID(),
       web_contents()->GetMainFrame()->GetRoutingID(),
       -1);
+  const url::Origin origin(url);
   permission_context.RequestPermission(
-      web_contents(), id, url,
+      web_contents(), id, origin,
       base::Bind(&TestPermissionContext::TrackPermissionDecision,
                  base::Unretained(&permission_context)));
 
   EXPECT_TRUE(permission_context.permission_set());
   EXPECT_FALSE(permission_context.permission_granted());
   EXPECT_TRUE(permission_context.tab_context_updated());
 
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(profile())
           ->GetContentSetting(url.GetOrigin(),
@@ skipping 22 matching lines @@
                               insecure_url.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
                               std::string()));
   EXPECT_EQ(CONTENT_SETTING_ASK,
       HostContentSettingsMapFactory::GetForProfile(profile())
           ->GetContentSetting(insecure_url.GetOrigin(),
                               secure_url.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
                               std::string()));
 
+  const url::Origin insecure_origin(insecure_url);
+  const url::Origin secure_origin(secure_url);
   EXPECT_EQ(CONTENT_SETTING_BLOCK, permission_context.GetPermissionStatus(
-      insecure_url, insecure_url));
+                                       insecure_origin, insecure_origin));
   EXPECT_EQ(CONTENT_SETTING_BLOCK, permission_context.GetPermissionStatus(
-      insecure_url, secure_url));
+                                       insecure_origin, secure_origin));
 }