media: Refactor PlatformVerificationFlow.

chrome/browser/media/protected_media_identifier_permission_context.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_
 #define CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_
 
 #include "chrome/browser/content_settings/permission_context_base.h"
 #include "components/content_settings/core/common/permission_request_id.h"
 
@@ skipping 36 matching lines @@
   void CancelPermissionRequest(content::WebContents* web_contents,
                                const PermissionRequestID& id) override;
 
  private:
   ~ProtectedMediaIdentifierPermissionContext() override;
 
   void UpdateTabContext(const PermissionRequestID& id,
                         const GURL& requesting_frame,
                         bool allowed) override;
 
-  // Returns whether "Protected content" is enabled. It can be disabled by a
-  // user in the master switch in content settings, or by the device policy.
+  // Returns whether "Protected content" is enabled considering factors other

[ddorwin, 2015/03/12 00:28:32]

nit: comma after enabled. Or, perhaps s/considering/based on/

+  // than the protected media identifier content setting itself. For example,
+  // it can be disabled by a master switch in content settings, in incognito or

[ddorwin, 2015/03/12 00:28:32]

tiny nit: Capital I and G

+  // guest mode, or by the device policy.
   bool IsProtectedMediaIdentifierEnabled() const;
 
 #if defined(OS_CHROMEOS)
-  void OnPlatformVerificationResult(
+  void OnPlatformVerificationConsentResponse(
       content::WebContents* web_contents,
       const PermissionRequestID& id,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
       const BrowserPermissionCallback& callback,
-      chromeos::attestation::PlatformVerificationFlow::ConsentResponse
+      chromeos::attestation::PlatformVerificationDialog::ConsentResponse
           response);
 
   // |this| is shared among multiple WebContents, so we could receive multiple
   // permission requests. This map tracks all pending requests. Note that we
   // only allow one request per WebContents.
   typedef std::map<content::WebContents*,
                    std::pair<views::Widget*, PermissionRequestID>>
       PendingRequestMap;
   PendingRequestMap pending_requests_;
 
   // Must be the last member, to ensure that it will be
   // destroyed first, which will invalidate weak pointers
   base::WeakPtrFactory<ProtectedMediaIdentifierPermissionContext> weak_factory_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProtectedMediaIdentifierPermissionContext);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_