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

Unified Diff: chrome/browser/themes/theme_service_unittest.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/app_list/app_list_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service_unittest.cc
diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc
index c834234d66b38eb730e0411a62b9fd88370d0503..3238c1031c1b1b2c577e39205fe4ed6a34a4b485 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -30,7 +30,7 @@ namespace theme_service_internal {
class ThemeServiceTest : public extensions::ExtensionServiceTestBase {
public:
- ThemeServiceTest() : is_managed_(false),
+ ThemeServiceTest() : is_supervised_(false),
registry_(NULL) {}
virtual ~ThemeServiceTest() {}
@@ -86,7 +86,7 @@ class ThemeServiceTest : public extensions::ExtensionServiceTestBase {
extensions::ExtensionServiceTestBase::SetUp();
extensions::ExtensionServiceTestBase::ExtensionServiceInitParams params =
CreateDefaultInitParams();
- params.profile_is_managed = is_managed_;
+ params.profile_is_supervised = is_supervised_;
InitializeExtensionService(params);
service_->Init();
registry_ = ExtensionRegistry::Get(profile_.get());
@@ -98,7 +98,7 @@ class ThemeServiceTest : public extensions::ExtensionServiceTestBase {
}
protected:
- bool is_managed_;
+ bool is_supervised_;
ExtensionRegistry* registry_;
};
@@ -230,32 +230,33 @@ TEST_F(ThemeServiceTest, ThemeUpgrade) {
ExtensionRegistry::DISABLED));
}
-class ThemeServiceManagedUserTest : public ThemeServiceTest {
+class ThemeServiceSupervisedUserTest : public ThemeServiceTest {
public:
- ThemeServiceManagedUserTest() {}
- virtual ~ThemeServiceManagedUserTest() {}
+ ThemeServiceSupervisedUserTest() {}
+ virtual ~ThemeServiceSupervisedUserTest() {}
virtual void SetUp() OVERRIDE {
- is_managed_ = true;
+ is_supervised_ = true;
ThemeServiceTest::SetUp();
}
};
-// Checks that managed users have their own default theme.
-TEST_F(ThemeServiceManagedUserTest, ManagedUserThemeReplacesDefaultTheme) {
+// Checks that supervised users have their own default theme.
+TEST_F(ThemeServiceSupervisedUserTest,
+ SupervisedUserThemeReplacesDefaultTheme) {
ThemeService* theme_service =
ThemeServiceFactory::GetForProfile(profile_.get());
theme_service->UseDefaultTheme();
EXPECT_TRUE(theme_service->UsingDefaultTheme());
EXPECT_TRUE(get_theme_supplier(theme_service));
EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),
- CustomThemeSupplier::MANAGED_USER_THEME);
+ CustomThemeSupplier::SUPERVISED_USER_THEME);
}
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// Checks that managed users don't use the system theme even if it is the
+// Checks that supervised users don't use the system theme even if it is the
// default. The system theme is only available on Linux.
-TEST_F(ThemeServiceManagedUserTest, ManagedUserThemeReplacesNativeTheme) {
+TEST_F(ThemeServiceSupervisedUserTest, SupervisedUserThemeReplacesNativeTheme) {
profile_->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true);
ThemeService* theme_service =
ThemeServiceFactory::GetForProfile(profile_.get());
@@ -263,7 +264,7 @@ TEST_F(ThemeServiceManagedUserTest, ManagedUserThemeReplacesNativeTheme) {
EXPECT_TRUE(theme_service->UsingDefaultTheme());
EXPECT_TRUE(get_theme_supplier(theme_service));
EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),
- CustomThemeSupplier::MANAGED_USER_THEME);
+ CustomThemeSupplier::SUPERVISED_USER_THEME);
}
#endif
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/app_list/app_list_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698