media: Refactor PlatformVerificationFlow.

chrome/browser/chromeos/attestation/platform_verification_flow.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_CHROMEOS_ATTESTATION_PLATFORM_VERIFICATION_FLOW_H_
 #define CHROME_BROWSER_CHROMEOS_ATTESTATION_PLATFORM_VERIFICATION_FLOW_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 56 matching lines @@
     SUCCESS,                // The operation succeeded.
     INTERNAL_ERROR,         // The operation failed unexpectedly.
     PLATFORM_NOT_VERIFIED,  // The platform cannot be verified.  For example:
                             // - It is not a Chrome device.
                             // - It is not running a verified OS image.
     USER_REJECTED,          // The user explicitly rejected the operation.
     POLICY_REJECTED,        // The operation is not allowed by policy/settings.
     TIMEOUT,                // The operation timed out.
   };
 
-  enum ConsentResponse {
-    CONSENT_RESPONSE_NONE,
-    CONSENT_RESPONSE_ALLOW,
-    CONSENT_RESPONSE_DENY,
-  };
-
   // An interface which allows settings and UI to be abstracted for testing
   // purposes.  For normal operation the default implementation should be used.
   class Delegate {
    public:
     virtual ~Delegate() {}
 
-    // This callback will be called when a user has given a |response| to a
-    // consent request of the specified |type|.
-    typedef base::Callback<void(ConsentResponse response)> ConsentCallback;
-
-    // Invokes consent UI within the context of |web_contents| and calls
-    // |callback| when the user responds.
-    // |requesting_origin| or the extension/app name will be shown on the prompt
-    // if the request comes from a web page or an extension/app, respectively.
-    virtual void ShowConsentPrompt(content::WebContents* web_contents,
-                                   const GURL& requesting_origin,
-                                   const ConsentCallback& callback) = 0;
-
     // Gets prefs associated with the given |web_contents|.  If no prefs are
     // associated with |web_contents| then NULL is returned.
     virtual PrefService* GetPrefs(content::WebContents* web_contents) = 0;
 
     // Gets the URL associated with the given |web_contents|.
     virtual const GURL& GetURL(content::WebContents* web_contents) = 0;
 
     // Gets the user associated with the given |web_contents|.  NULL may be
     // returned.
     virtual const user_manager::User* GetUser(
@@ skipping 67 matching lines @@
     ~ChallengeContext();
 
     content::WebContents* web_contents;
     std::string service_id;
     std::string challenge;
     ChallengeCallback callback;
   };
 
   ~PlatformVerificationFlow();
 
   // Checks whether the device has already been enrolled for attestation. The

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

Is this comment still accurate?

   // arguments to ChallengePlatformKey are in |context| and
   // |attestation_prepared| specifies whether attestation has been prepared on
   // this device.
-  void CheckEnrollment(const ChallengeContext& context,
-                       bool attestation_prepared);
-
-  // Checks whether we need to prompt the user for consent before proceeding and
-  // invokes the consent UI if so.  The arguments to ChallengePlatformKey are
-  // in |context| and |attestation_enrolled| specifies whether attestation has
-  // been enrolled for this device.
-  void CheckConsent(const ChallengeContext& context,
-                    bool attestation_enrolled);
-
-  // A callback called when the user has given their consent response.  The
-  // arguments to ChallengePlatformKey are in |context|.  |consent_required| and
-  // |consent_response| indicate whether consent was required and user response,
-  // respectively.  If the response indicates that the operation should proceed,
-  // this method invokes a certificate request.
-  void OnConsentResponse(const ChallengeContext& context,
-                         bool consent_required,
-                         ConsentResponse consent_response);
+  void OnAttestationPrepared(const ChallengeContext& context,
+                             bool attestation_prepared);
 
   // Initiates the flow to get a platform key certificate.  The arguments to
   // ChallengePlatformKey are in |context|.  |user_id| identifies the user for
   // which to get a certificate.  If |force_new_key| is true then any existing
   // key for the same user and service will be ignored and a new key will be
   // generated and certified.
   void GetCertificate(const ChallengeContext& context,
                       const std::string& user_id,
                       bool force_new_key);
 
@@ skipping 21 matching lines @@
   // |certificate| is the platform certificate for the key which signed the
   // |challenge|.  The arguments to ChallengePlatformKey are in |context|.
   // |operation_success| is true iff the challenge signing operation was
   // successful.  If it was successful, |response_data| holds the challenge
   // response and the method will invoke |context.callback|.
   void OnChallengeReady(const ChallengeContext& context,
                         const std::string& certificate,
                         bool operation_success,
                         const std::string& response_data);
 
-  // Checks whether policy or profile settings associated with |web_contents|
-  // have attestation for content protection explicitly disabled.
-  bool IsAttestationEnabled(content::WebContents* web_contents);
+  // Checks whether attestation for content protection is allowed by policy.
+  bool IsAttestationAllowedByPolicy();
 
-  // Updates user settings for the profile associated with |web_contents| based
-  // on the |consent_response| to the request of type |consent_type|.
-  bool UpdateSettings(content::WebContents* web_contents,
-                      ConsentResponse consent_response);
+  // Checks whether attestation is permitted by user.
+  bool IsPermittedByUser(content::WebContents* web_contents);
 
   // Finds the origin-specific consent pref in |content_settings| for |url|.  If
   // a pref exists for the origin, returns true and sets |pref_value| if it is
   // not NULL.
   bool GetOriginPref(HostContentSettingsMap* content_settings,
                      const GURL& url,
                      bool* pref_value);
 
-  // Records the origin-specific consent pref in |content_settings| for |url|.
-  // The pref will be set to |allow_origin|.
-  void RecordOriginConsent(HostContentSettingsMap* content_settings,
-                           const GURL& url,
-                           bool allow_origin);
-
   // Returns true iff |certificate| is an expired X.509 certificate.
   bool IsExpired(const std::string& certificate);
 
   AttestationFlow* attestation_flow_;
   scoped_ptr<AttestationFlow> default_attestation_flow_;
   cryptohome::AsyncMethodCaller* async_caller_;
   CryptohomeClient* cryptohome_client_;
   Delegate* delegate_;
   scoped_ptr<Delegate> default_delegate_;
   base::TimeDelta timeout_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformVerificationFlow);
 };
 
 }  // namespace attestation
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_ATTESTATION_PLATFORM_VERIFICATION_FLOW_H_