media: Invoke PlatformVerificationDialog from ProtectedMediaIdentifierPermissionContext.

chrome/browser/content_settings/permission_context_base.cc

 // Copyright 2014 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/content_settings/permission_context_base.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
-using chromeos::attestation::PlatformVerificationDialog;
-using chromeos::attestation::PlatformVerificationFlow;
-#endif
-
 PermissionContextBase::PermissionContextBase(
     Profile* profile,
     const ContentSettingsType permission_type)
     : profile_(profile),
       permission_type_(permission_type),
       weak_factory_(this) {
   permission_queue_controller_.reset(
       new PermissionQueueController(profile_, permission_type_));
+

[Jun Mukai, 2015/02/05 02:08:14]

nit: remove blank line

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

?

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

Done.

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

Done.

 }
 
 PermissionContextBase::~PermissionContextBase() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 void PermissionContextBase::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
@@ skipping 80 matching lines @@
       NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                           false /* persist */, true /* granted */);
       return;
     default:
       break;
   }
 
   PermissionContextUmaUtil::PermissionRequested(
       permission_type_, requesting_origin);
 
-#if defined(OS_CHROMEOS)
-  // TODO(xhwang): This is to use the existing platform verification UI. Remove
-  // it when the infobar/bubble UI can satisfy our requirements.
-  if (permission_type_ == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
-    PlatformVerificationDialog::ShowDialog(
-        web_contents,
-        base::Bind(&PermissionContextBase::OnPlatformVerificationResult,
-                   weak_factory_.GetWeakPtr(), id, requesting_origin,
-                   embedding_origin, callback));
-    return;
-  }
-#endif
-
   if (PermissionBubbleManager::Enabled()) {
     if (pending_bubbles_.get(id.ToString()) != NULL)
       return;
     PermissionBubbleManager* bubble_manager =
         PermissionBubbleManager::FromWebContents(web_contents);
     DCHECK(bubble_manager);
     scoped_ptr<PermissionBubbleRequest> request_ptr(
         new PermissionBubbleRequestImpl(
             requesting_origin, user_gesture, permission_type_,
             profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
@@ skipping 83 matching lines @@
                                                  bool allowed) {
   DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
   DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
   ContentSetting content_setting =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
       ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
       permission_type_, std::string(), content_setting);
 }
-
-#if defined(OS_CHROMEOS)
-void PermissionContextBase::OnPlatformVerificationResult(
-    const PermissionRequestID& id,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin,
-    const BrowserPermissionCallback& callback,
-    chromeos::attestation::PlatformVerificationFlow::ConsentResponse response) {
-  if (response == PlatformVerificationFlow::CONSENT_RESPONSE_NONE) {
-    // Deny request and do not save to content settings.
-    PermissionDecided(id, requesting_origin, embedding_origin, callback,
-                      false,   // Do not save to content settings.
-                      false);  // Do not allow the permission.
-    return;
-  }
-
-  PermissionDecided(
-      id, requesting_origin, embedding_origin, callback,
-      true,  // Save to content settings.
-      response == PlatformVerificationFlow::CONSENT_RESPONSE_ALLOW);
-}
-#endif