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

Unified Diff: chrome/browser/metrics/chromeos_metrics_provider_unittest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixed. Created 5 years, 10 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/metrics/chromeos_metrics_provider_unittest.cc
diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
index 2bd9218cd75ed096699e56f361e3f767ef263247..897075778a737b59aa7b7df3efa27d7bbb8ae653 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include "base/basictypes.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/metrics/chromeos_metrics_provider.h"
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -120,7 +120,8 @@ TEST_F(ChromeOSMetricsProviderTest, MultiProfileUserCount) {
std::string user3("user3@example.com");
// |scoped_enabler| takes over the lifetime of |user_manager|.
- chromeos::FakeUserManager* user_manager = new chromeos::FakeUserManager();
+ chromeos::FakeChromeUserManager* user_manager =
+ new chromeos::FakeChromeUserManager();
chromeos::ScopedUserManagerEnabler scoped_enabler(user_manager);
user_manager->AddKioskAppUser(user1);
user_manager->AddKioskAppUser(user2);
@@ -142,7 +143,8 @@ TEST_F(ChromeOSMetricsProviderTest, MultiProfileCountInvalidated) {
std::string user3("user3@example.com");
// |scoped_enabler| takes over the lifetime of |user_manager|.
- chromeos::FakeUserManager* user_manager = new chromeos::FakeUserManager();
+ chromeos::FakeChromeUserManager* user_manager =
+ new chromeos::FakeChromeUserManager();
chromeos::ScopedUserManagerEnabler scoped_enabler(user_manager);
user_manager->AddKioskAppUser(user1);
user_manager->AddKioskAppUser(user2);

Powered by Google App Engine
This is Rietveld 408576698