media: Invoke PlatformVerificationDialog from ProtectedMediaIdentifierPermissionContext.

chrome/browser/chromeos/attestation/platform_verification_flow.cc

 // Copyright 2013 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/chromeos/attestation/platform_verification_flow.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 61 matching lines @@
 namespace attestation {
 
 // A default implementation of the Delegate interface.
 class DefaultDelegate : public PlatformVerificationFlow::Delegate {
  public:
   DefaultDelegate() {}
   ~DefaultDelegate() override {}
 
   void ShowConsentPrompt(
       content::WebContents* web_contents,
+      const GURL& requesting_origin,
       const PlatformVerificationFlow::Delegate::ConsentCallback& callback)
       override {
-    PlatformVerificationDialog::ShowDialog(web_contents, callback);
+    PlatformVerificationDialog::ShowDialog(web_contents, requesting_origin,
+                                           callback);
   }
 
   PrefService* GetPrefs(content::WebContents* web_contents) override {
     return user_prefs::UserPrefs::Get(web_contents->GetBrowserContext());
   }
 
   const GURL& GetURL(content::WebContents* web_contents) override {
     const GURL& url = web_contents->GetLastCommittedURL();
     if (!url.is_valid())
       return web_contents->GetVisibleURL();
@@ skipping 133 matching lines @@
       !pref_service->GetBoolean(prefs::kRAConsentFirstTime) ||
       // Consent required if consent has never been given for this domain.
       !GetDomainPref(delegate_->GetContentSettings(context.web_contents),
                      delegate_->GetURL(context.web_contents),
                      NULL));
   Delegate::ConsentCallback consent_callback = base::Bind(
       &PlatformVerificationFlow::OnConsentResponse,
       this,
       context,
       consent_required);
-  if (consent_required)
-    delegate_->ShowConsentPrompt(context.web_contents, consent_callback);
-  else
+  if (consent_required) {
+    delegate_->ShowConsentPrompt(
+        context.web_contents,
+        context.web_contents->GetLastCommittedURL().GetOrigin(),

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

This is the old path and will be removed when prefixed is fixed, right?

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

Yes, this is not secure. But it'll be removed soon.

+        consent_callback);
+  } else {
     consent_callback.Run(CONSENT_RESPONSE_NONE);
+  }
 }
 
 void PlatformVerificationFlow::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kRAConsentFirstTime,
                              false,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 void PlatformVerificationFlow::OnConsentResponse(
@@ skipping 244 matching lines @@
                                             certificate.length()));
   if (!x509.get() || x509->valid_expiry().is_null()) {
     LOG(WARNING) << "Failed to parse certificate, cannot check expiry.";
     return false;
   }
   return (base::Time::Now() > x509->valid_expiry());
 }
 
 }  // namespace attestation
 }  // namespace chromeos