Added multi-profile support for attestation on chromeos.

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 "platform_verification_flow.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
@@ skipping 220 matching lines @@
       ReportError(callback, USER_REJECTED);
       return;
     } else if (consent_response == CONSENT_RESPONSE_ALLOW) {
       content::RecordAction(
           content::UserMetricsAction("PlatformVerificationAccepted"));
     }
   }
 
   // At this point all user interaction is complete and we can proceed with the
   // certificate request.
+  chromeos::User* user = user_manager_->GetUserByProfile(

[bartfab (slow), 2013/10/13 16:31:35]

#include "chrome/browser/chromeos/login/user.h"

[Darren Krahn, 2013/10/15 16:49:06]

Done.

+      Profile::FromBrowserContext(web_contents->GetBrowserContext()));

[bartfab (slow), 2013/10/13 16:31:35]

#include "content/public/browser/browser_context.h"
#include "chrome/browser/profiles/profile.h"

[Darren Krahn, 2013/10/15 16:49:06]

Done.

+  if (!user) {
+    ReportError(callback, INTERNAL_ERROR);
+    LOG(ERROR) << "Profile does not map to a valid user.";
+    return;
+  }
   AttestationFlow::CertificateCallback certificate_callback = base::Bind(
       &PlatformVerificationFlow::OnCertificateReady,
       weak_factory_.GetWeakPtr(),
+      user->email(),
       service_id,
       challenge,
       callback);
   attestation_flow_->GetCertificate(
       PROFILE_CONTENT_PROTECTION_CERTIFICATE,
-      user_manager_->GetActiveUser()->email(),
+      user->email(),
       service_id,
       false,  // Don't force a new key.
       certificate_callback);
 }
 
 void PlatformVerificationFlow::OnCertificateReady(
+    const std::string& user_email,
     const std::string& service_id,
     const std::string& challenge,
     const ChallengeCallback& callback,
     bool operation_success,
     const std::string& certificate) {
   if (!operation_success) {
     LOG(WARNING) << "PlatformVerificationFlow: Failed to certify platform.";
     ReportError(callback, PLATFORM_NOT_VERIFIED);
     return;
   }
   cryptohome::AsyncMethodCaller::DataCallback cryptohome_callback = base::Bind(
       &PlatformVerificationFlow::OnChallengeReady,
       weak_factory_.GetWeakPtr(),
       certificate,
       challenge,
       callback);
   std::string key_name = kContentProtectionKeyPrefix;
   key_name += service_id;
   async_caller_->TpmAttestationSignSimpleChallenge(KEY_USER,
+                                                   user_email,
                                                    key_name,
                                                    challenge,
                                                    cryptohome_callback);
 }
 
 void PlatformVerificationFlow::OnChallengeReady(
     const std::string& certificate,
     const std::string& challenge,
     const ChallengeCallback& callback,
     bool operation_success,
@@ skipping 136 matching lines @@
     bool allow_domain) {
   PrefService* pref_service = GetPrefs(web_contents);
   CHECK(pref_service);
   DictionaryPrefUpdate updater(pref_service, prefs::kRAConsentDomains);
   const GURL& url = GetURL(web_contents);
   updater->SetBoolean(url.host(), allow_domain);
 }
 
 }  // namespace attestation
 }  // namespace chromeos