media: Invoke PlatformVerificationDialog from ProtectedMediaIdentifierPermissionContext.

chrome/browser/chromeos/attestation/platform_verification_dialog.cc

Index: chrome/browser/chromeos/attestation/platform_verification_dialog.cc
diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
index d3cb6b907abbf476cf7a91962df6dbae9acf0b14..007178c015be43072d0631154e1e9319a133fb77 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
@@ -37,16 +37,18 @@ const int kDialogMaxWidthInPixel = 400;
 }  // namespace
 
 // static
-void PlatformVerificationDialog::ShowDialog(
+views::Widget* PlatformVerificationDialog::ShowDialog(
     content::WebContents* web_contents,
+    const GURL& requesting_origin,
     const PlatformVerificationFlow::Delegate::ConsentCallback& callback) {
-  GURL url = web_contents->GetLastCommittedURL();
   // In the case of an extension or hosted app, the origin of the request is
   // best described by the extension / app name.
+  GURL url = web_contents->GetLastCommittedURL();

[ddorwin, 2015/02/05 02:23:23]

navigation_url, top_level_url, or something like that?

[xhwang, 2015/02/05 02:49:34]

Done.

   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(web_contents->GetBrowserContext())->
           enabled_extensions().GetExtensionOrAppByURL(url);
-  std::string origin = extension ? extension->name() : url.GetOrigin().spec();
+
+  std::string origin = extension ? extension->name() : requesting_origin.spec();

[ddorwin, 2015/02/05 02:23:23]

should we confirm that the requesting_origin is the same as the url's origin?
Otherwise, we might do the wrong thing. I wonder what the desired behavior is...

This could happen if an app is hosting an iframe on a server. Maybe this is
handled in other ways, though.

[xhwang, 2015/02/05 02:49:34]

|requesting_origin| is the root of trust here, it's the real one requesting this
permission. We have url here only to get the extension/app name.

[ddorwin, 2015/02/05 03:25:26]

But in the app case, we display the app name instead of the requesting origin.
Thus, apps/extensions behave differently than normal web pages - not just in the
use of a pretty name, but in the entity being identified.

[xhwang, 2015/02/05 05:46:51]

Do you mean to check that the frame's url is the same as the embedding url for
extension/app?

[ddorwin, 2015/02/05 05:51:06]

Yes. And otherwise display the frame. Perhaps, if extension && equal, use name.
Otherwise, use frame origin.

 
   PlatformVerificationDialog* dialog = new PlatformVerificationDialog(
       web_contents,
@@ -60,6 +62,8 @@ void PlatformVerificationDialog::ShowDialog(
   views::Widget* widget = views::DialogDelegate::CreateDialogWidget(
       dialog, NULL, popup_manager->GetHostView());
   popup_manager->ShowModalDialog(widget->GetNativeView(), web_contents);
+
+  return widget;
 }
 
 PlatformVerificationDialog::~PlatformVerificationDialog() {