summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browsing_data/browsing_data_remover.cc
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-23 14:51:59 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-23 14:51:59 +0000
commit2fda997ecb56189df96c01b5fd78c277c7da6ac3 (patch)
tree301a25d8f2366ec2f516571df2c5e478c9988c14 /chrome/browser/browsing_data/browsing_data_remover.cc
parent147bb4254d86e64c9577b08694c41cf82cc06c60 (diff)
downloadchromium_src-2fda997ecb56189df96c01b5fd78c277c7da6ac3.zip
chromium_src-2fda997ecb56189df96c01b5fd78c277c7da6ac3.tar.gz
chromium_src-2fda997ecb56189df96c01b5fd78c277c7da6ac3.tar.bz2
[cros] Move User class to user_manager component.
Depends on https://codereview.chromium.org/400973002/ BUG=387614 TBR=zelidrag@chromium.org,derat@chromium.org,stevenjb@chromium.org Review URL: https://codereview.chromium.org/398753004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data/browsing_data_remover.cc')
-rw-r--r--chrome/browser/browsing_data/browsing_data_remover.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 2cc1fcf..540a575 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -76,12 +76,12 @@
#include "webkit/common/quota/quota_types.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chromeos/attestation/attestation_constants.h"
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
+#include "components/user_manager/user.h"
#endif
#if defined(ENABLE_EXTENSIONS)
@@ -658,7 +658,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
pepper_flash_settings_manager_->DeauthorizeContentLicenses(prefs);
#if defined(OS_CHROMEOS)
// On Chrome OS, also delete any content protection platform keys.
- chromeos::User* user =
+ user_manager::User* user =
chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
if (!user) {
LOG(WARNING) << "Failed to find user for current profile.";