summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/power
diff options
context:
space:
mode:
authormerkulova <merkulova@chromium.org>2015-02-04 02:18:30 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-04 10:19:29 +0000
commit793f3021c1d74a754af1d1080b0e412005f1413b (patch)
tree329853f118f9702ba6f2bb12805373b827137a71 /chrome/browser/chromeos/power
parent9b213685f06300abf07e3ef2833c837043da026a (diff)
downloadchromium_src-793f3021c1d74a754af1d1080b0e412005f1413b.zip
chromium_src-793f3021c1d74a754af1d1080b0e412005f1413b.tar.gz
chromium_src-793f3021c1d74a754af1d1080b0e412005f1413b.tar.bz2
UserManager stack refactoring.
Before: while UserManager and UserManagerBase were componentized to user_manager namespace, FakeUserManager was staying at chromeos namespace. After: UserManager Chrome OS-related interface moved to a separate class ChromeUserManagerInterface. Mixing it to UserManagerBase and FakeUserManager we're getting chrome OS versions of them. That allows us to move UserManagerBase and FakeUserManager into component user_manager. Main changes are located at .*user_manager.* files. Such as chrome_user_manager, chrome_user_manager_interface, fake_chrome_user_manager, user_manager_base etc. Other files (mostly tests) were changed due to changes in include paths and FakeUserManager class renaming. BUG=443119 Review URL: https://codereview.chromium.org/824683002 Cr-Commit-Position: refs/heads/master@{#314532}
Diffstat (limited to 'chrome/browser/chromeos/power')
-rw-r--r--chrome/browser/chromeos/power/extension_event_observer_unittest.cc6
-rw-r--r--chrome/browser/chromeos/power/power_prefs_unittest.cc4
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
index acc30b7..d35a740 100644
--- a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
+++ b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.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/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ -36,7 +36,7 @@ class ExtensionEventObserverTest : public ::testing::Test {
public:
ExtensionEventObserverTest()
: power_manager_client_(new FakePowerManagerClient()),
- fake_user_manager_(new FakeUserManager()),
+ fake_user_manager_(new FakeChromeUserManager()),
scoped_user_manager_enabler_(fake_user_manager_) {
DBusThreadManager::GetSetterForTesting()->SetPowerManagerClient(
make_scoped_ptr(power_manager_client_));
@@ -132,7 +132,7 @@ class ExtensionEventObserverTest : public ::testing::Test {
ScopedTestCrosSettings test_cros_settings_;
// Owned by |scoped_user_manager_enabler_|.
- FakeUserManager* fake_user_manager_;
+ FakeChromeUserManager* fake_user_manager_;
ScopedUserManagerEnabler scoped_user_manager_enabler_;
std::vector<scoped_refptr<extensions::Extension>> created_apps_;
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc
index cd881fa..9bf1e9c 100644
--- a/chrome/browser/chromeos/power/power_prefs_unittest.cc
+++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/prefs/pref_service.h"
#include "chrome/browser/chrome_notification_types.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/profiles/profile_helper.h"
#include "chrome/browser/extensions/extension_special_storage_policy.h"
@@ -234,7 +234,7 @@ TEST_F(PowerPrefsTest, LoginScreen) {
}
TEST_F(PowerPrefsTest, UserSession) {
- FakeUserManager* user_manager = new FakeUserManager();
+ FakeChromeUserManager* user_manager = new FakeChromeUserManager();
ScopedUserManagerEnabler user_manager_enabler(user_manager);
// Set up user profile.