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

Unified Diff: chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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/supervised_user/supervised_user_pref_mapping_service_unittest.cc
diff --git a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc
similarity index 67%
rename from chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc
index 88e836f414e0d8e0b625c7c5e5724780fc46d9ed..4a553b91aa8c518f887eb894c63319c9dad5c8cf 100644
--- a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc
@@ -5,11 +5,11 @@
#include <string>
#include "base/prefs/pref_service.h"
-#include "chrome/browser/managed_mode/managed_user_constants.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"
-#include "chrome/browser/managed_mode/supervised_user_pref_mapping_service.h"
-#include "chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_pref_mapping_service.h"
+#include "chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,7 +22,7 @@ class SupervisedUserPrefMappingServiceTest : public ::testing::Test {
profile_.GetPrefs()->SetString(prefs::kSupervisedUserId,
kFakeSupervisedUserId);
shared_settings_service_ =
- ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(
+ SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
&profile_);
mapping_service_ =
SupervisedUserPrefMappingServiceFactory::GetForBrowserContext(
@@ -41,17 +41,17 @@ class SupervisedUserPrefMappingServiceTest : public ::testing::Test {
}
TestingProfile profile_;
- ManagedUserSharedSettingsService* shared_settings_service_;
+ SupervisedUserSharedSettingsService* shared_settings_service_;
SupervisedUserPrefMappingService* mapping_service_;
};
TEST_F(SupervisedUserPrefMappingServiceTest, CheckPrefUpdate) {
EXPECT_TRUE(shared_settings_service_->GetValue(
- kFakeSupervisedUserId, managed_users::kChromeAvatarIndex) ==
- NULL);
+ kFakeSupervisedUserId,
+ supervised_users::kChromeAvatarIndex) == NULL);
profile_.GetPrefs()->SetInteger(prefs::kProfileAvatarIndex, 4);
const base::Value* value = shared_settings_service_->GetValue(
- kFakeSupervisedUserId, managed_users::kChromeAvatarIndex);
+ kFakeSupervisedUserId, supervised_users::kChromeAvatarIndex);
int avatar_index;
value->GetAsInteger(&avatar_index);
EXPECT_EQ(avatar_index, 4);
@@ -60,9 +60,10 @@ TEST_F(SupervisedUserPrefMappingServiceTest, CheckPrefUpdate) {
TEST_F(SupervisedUserPrefMappingServiceTest, CheckSharedSettingUpdate) {
EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), -1);
shared_settings_service_->SetValue(kFakeSupervisedUserId,
- managed_users::kChromeAvatarIndex,
+ supervised_users::kChromeAvatarIndex,
base::FundamentalValue(1));
- mapping_service_->OnSharedSettingChanged(kFakeSupervisedUserId,
- managed_users::kChromeAvatarIndex);
+ mapping_service_->OnSharedSettingChanged(
+ kFakeSupervisedUserId,
+ supervised_users::kChromeAvatarIndex);
EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), 1);
}

Powered by Google App Engine
This is Rietveld 408576698