| Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| index 05c6be267d78f8d0528b44f364ef0188cdc9079c..0e5742e3aabdd187f218634ab98599b2415815de 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| +++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| @@ -15,7 +15,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/string_util.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/chromeos/policy/device_policy_builder.h"
|
| #include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| @@ -180,7 +180,7 @@ class DeviceSettingsTestBase : public testing::Test {
|
| DeviceSettingsTestHelper device_settings_test_helper_;
|
| // Note that FakeUserManager is used by ProfileHelper, which some of the
|
| // tested classes depend on implicitly.
|
| - FakeUserManager* user_manager_;
|
| + FakeChromeUserManager* user_manager_;
|
| ScopedUserManagerEnabler user_manager_enabler_;
|
| scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
|
| // Local DeviceSettingsService instance for tests. Avoid using in combination
|
|
|