| Index: chrome/browser/chromeos/attestation/platform_verification_flow.cc
|
| diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
|
| index f95ebeb37b62b5c18ab495fb67f20e50a69ffcde..83abc0b4c5941f71ed163f42129dbbbfee57065a 100644
|
| --- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc
|
| +++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
|
| @@ -13,7 +13,6 @@
|
| #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
|
| #include "chrome/browser/chromeos/attestation/attestation_signed_data.pb.h"
|
| #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
|
| -#include "chrome/browser/chromeos/login/users/user.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/content_settings/host_content_settings_map.h"
|
| @@ -25,6 +24,7 @@
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| +#include "components/user_manager/user.h"
|
| #include "components/user_prefs/user_prefs.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -87,7 +87,8 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate {
|
| return url;
|
| }
|
|
|
| - virtual User* GetUser(content::WebContents* web_contents) OVERRIDE {
|
| + virtual user_manager::User* GetUser(
|
| + content::WebContents* web_contents) OVERRIDE {
|
| return ProfileHelper::Get()->GetUserByProfile(
|
| Profile::FromBrowserContext(web_contents->GetBrowserContext()));
|
| }
|
| @@ -254,7 +255,7 @@ void PlatformVerificationFlow::OnConsentResponse(
|
|
|
| // At this point all user interaction is complete and we can proceed with the
|
| // certificate request.
|
| - chromeos::User* user = delegate_->GetUser(context.web_contents);
|
| + user_manager::User* user = delegate_->GetUser(context.web_contents);
|
| if (!user) {
|
| ReportError(context.callback, INTERNAL_ERROR);
|
| LOG(ERROR) << "Profile does not map to a valid user.";
|
|
|