Simplify PlatformVerificationFlow::CheckConsent() logic.

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 239 matching lines @@
 
   // Checks whether policy or profile settings associated with |web_contents|
   // have attestation for content protection explicitly disabled.
   bool IsAttestationEnabled(content::WebContents* web_contents);
 
   // 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);
 
-  // Finds the domain-specific consent pref in |content_settings| for |url|.  If
-  // a pref exists for the domain, returns true and sets |pref_value| if it is
+  // 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 GetDomainPref(HostContentSettingsMap* content_settings,
+  bool GetOriginPref(HostContentSettingsMap* content_settings,
                      const GURL& url,
                      bool* pref_value);
 
-  // Records the domain-specific consent pref in |content_settings| for |url|.
-  // The pref will be set to |allow_domain|.
-  void RecordDomainConsent(HostContentSettingsMap* content_settings,
+  // 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_domain);
+                           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_