Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1199)

Unified Diff: chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: similarity Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
index d0bd6bfae1e7a3fc158a78e97f7e0513a040d7a0..0b82d9b6ed4336c90c89edae9312b7bff1ecd726 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -46,7 +47,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
// Get the active user.
const std::string& GetActiveUser() {
- return chromeos::UserManager::Get()->GetActiveUser()->email();
+ return user_manager::UserManager::Get()->GetActiveUser()->email();
}
chromeos::FakeUserManager* user_manager() { return user_manager_; }

Powered by Google App Engine
This is Rietveld 408576698