chrome/browser/themes/theme_service_unittest.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

Side by Side Diff: chrome/browser/themes/theme_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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/themes/theme_service.h"	5 #include "chrome/browser/themes/theme_service.h"

6	6

7 #include "base/file_util.h"	7 #include "base/file_util.h"

8 #include "base/path_service.h"	8 #include "base/path_service.h"

9 #include "chrome/browser/chrome_notification_types.h"	9 #include "chrome/browser/chrome_notification_types.h"

10 #include "chrome/browser/extensions/extension_service.h"	10 #include "chrome/browser/extensions/extension_service.h"

11 #include "chrome/browser/extensions/extension_service_test_base.h"	11 #include "chrome/browser/extensions/extension_service_test_base.h"

12 #include "chrome/browser/extensions/unpacked_installer.h"	12 #include "chrome/browser/extensions/unpacked_installer.h"

13 #include "chrome/browser/managed_mode/managed_user_service.h"	13 #include "chrome/browser/supervised_user/supervised_user_service.h"

14 #include "chrome/browser/managed_mode/managed_user_service_factory.h"	14 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"

15 #include "chrome/browser/themes/custom_theme_supplier.h"	15 #include "chrome/browser/themes/custom_theme_supplier.h"

16 #include "chrome/browser/themes/theme_service_factory.h"	16 #include "chrome/browser/themes/theme_service_factory.h"

17 #include "chrome/common/chrome_paths.h"	17 #include "chrome/common/chrome_paths.h"

18 #include "chrome/common/pref_names.h"	18 #include "chrome/common/pref_names.h"

19 #include "chrome/test/base/testing_browser_process.h"	19 #include "chrome/test/base/testing_browser_process.h"

20 #include "chrome/test/base/testing_profile.h"	20 #include "chrome/test/base/testing_profile.h"

21 #include "chrome/test/base/testing_profile_manager.h"	21 #include "chrome/test/base/testing_profile_manager.h"

22 #include "content/public/test/test_utils.h"	22 #include "content/public/test/test_utils.h"

23 #include "extensions/browser/extension_registry.h"	23 #include "extensions/browser/extension_registry.h"

24 #include "extensions/common/extension.h"	24 #include "extensions/common/extension.h"

(...skipping 237 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
262 ThemeServiceFactory::GetForProfile(profile_.get());	262 ThemeServiceFactory::GetForProfile(profile_.get());

263 theme_service->UseDefaultTheme();	263 theme_service->UseDefaultTheme();

264 EXPECT_TRUE(theme_service->UsingDefaultTheme());	264 EXPECT_TRUE(theme_service->UsingDefaultTheme());

265 EXPECT_TRUE(get_theme_supplier(theme_service));	265 EXPECT_TRUE(get_theme_supplier(theme_service));

266 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),	266 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),

267 CustomThemeSupplier::SUPERVISED_USER_THEME);	267 CustomThemeSupplier::SUPERVISED_USER_THEME);

268 }	268 }

269 #endif	269 #endif

270	270

271 }; // namespace theme_service_internal	271 }; // namespace theme_service_internal

OLD	NEW