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/supervised_user/supervised_user_service.h" | |
14 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | |
15 #include "chrome/browser/themes/custom_theme_supplier.h" | 13 #include "chrome/browser/themes/custom_theme_supplier.h" |
16 #include "chrome/browser/themes/theme_service_factory.h" | 14 #include "chrome/browser/themes/theme_service_factory.h" |
17 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
18 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
19 #include "chrome/test/base/testing_browser_process.h" | 17 #include "chrome/test/base/testing_browser_process.h" |
20 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
21 #include "chrome/test/base/testing_profile_manager.h" | 19 #include "chrome/test/base/testing_profile_manager.h" |
22 #include "content/public/test/test_utils.h" | 20 #include "content/public/test/test_utils.h" |
23 #include "extensions/browser/extension_registry.h" | 21 #include "extensions/browser/extension_registry.h" |
24 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
25 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
26 | 24 |
25 #if defined(ENABLE_MANAGED_USERS) | |
26 #include "chrome/browser/supervised_user/supervised_user_service.h" | |
27 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | |
28 #endif | |
29 | |
27 using extensions::ExtensionRegistry; | 30 using extensions::ExtensionRegistry; |
28 | 31 |
29 namespace theme_service_internal { | 32 namespace theme_service_internal { |
30 | 33 |
31 class ThemeServiceTest : public extensions::ExtensionServiceTestBase { | 34 class ThemeServiceTest : public extensions::ExtensionServiceTestBase { |
32 public: | 35 public: |
33 ThemeServiceTest() : is_supervised_(false), | 36 ThemeServiceTest() : is_supervised_(false), |
34 registry_(NULL) {} | 37 registry_(NULL) {} |
35 virtual ~ThemeServiceTest() {} | 38 virtual ~ThemeServiceTest() {} |
36 | 39 |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
224 EXPECT_TRUE(registry_->GetExtensionById(extension1_id, | 227 EXPECT_TRUE(registry_->GetExtensionById(extension1_id, |
225 ExtensionRegistry::DISABLED)); | 228 ExtensionRegistry::DISABLED)); |
226 | 229 |
227 // 2) Upgrading a disabled theme should not change the current theme. | 230 // 2) Upgrading a disabled theme should not change the current theme. |
228 UpdateUnpackedTheme(extension1_id); | 231 UpdateUnpackedTheme(extension1_id); |
229 EXPECT_EQ(extension2_id, theme_service->GetThemeID()); | 232 EXPECT_EQ(extension2_id, theme_service->GetThemeID()); |
230 EXPECT_TRUE(registry_->GetExtensionById(extension1_id, | 233 EXPECT_TRUE(registry_->GetExtensionById(extension1_id, |
231 ExtensionRegistry::DISABLED)); | 234 ExtensionRegistry::DISABLED)); |
232 } | 235 } |
233 | 236 |
237 #if defined(ENABLE_MANAGED_USERS) | |
234 class ThemeServiceSupervisedUserTest : public ThemeServiceTest { | 238 class ThemeServiceSupervisedUserTest : public ThemeServiceTest { |
235 public: | 239 public: |
236 ThemeServiceSupervisedUserTest() {} | 240 ThemeServiceSupervisedUserTest() {} |
237 virtual ~ThemeServiceSupervisedUserTest() {} | 241 virtual ~ThemeServiceSupervisedUserTest() {} |
238 | 242 |
239 virtual void SetUp() OVERRIDE { | 243 virtual void SetUp() OVERRIDE { |
240 is_supervised_ = true; | 244 is_supervised_ = true; |
241 ThemeServiceTest::SetUp(); | 245 ThemeServiceTest::SetUp(); |
242 } | 246 } |
243 }; | 247 }; |
(...skipping 17 matching lines...) Expand all Loading... | |
261 profile_->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true); | 265 profile_->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true); |
262 ThemeService* theme_service = | 266 ThemeService* theme_service = |
263 ThemeServiceFactory::GetForProfile(profile_.get()); | 267 ThemeServiceFactory::GetForProfile(profile_.get()); |
264 theme_service->UseDefaultTheme(); | 268 theme_service->UseDefaultTheme(); |
265 EXPECT_TRUE(theme_service->UsingDefaultTheme()); | 269 EXPECT_TRUE(theme_service->UsingDefaultTheme()); |
266 EXPECT_TRUE(get_theme_supplier(theme_service)); | 270 EXPECT_TRUE(get_theme_supplier(theme_service)); |
267 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(), | 271 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(), |
268 CustomThemeSupplier::SUPERVISED_USER_THEME); | 272 CustomThemeSupplier::SUPERVISED_USER_THEME); |
269 } | 273 } |
270 #endif | 274 #endif |
275 #endif | |
Bernhard Bauer
2014/07/14 16:39:05
It might be useful to add // defined(...) here.
mckev
2014/07/14 23:50:02
Good call - added.
| |
271 | 276 |
272 }; // namespace theme_service_internal | 277 }; // namespace theme_service_internal |
OLD | NEW |