Add custom default theme support and create a managed user default theme.

chrome/browser/themes/theme_service_unittest.cc

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 803b288bf9e37f04bda6a01fb3a0041b7034f116..0c298b54c03b8d0ba1e019e57af0a1da1586c65c 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -6,13 +6,15 @@
 
 #include "base/json/json_reader.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
+#include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
+namespace theme_service_test_internal {
 
 class ThemeServiceTest : public ExtensionServiceTestBase {
  public:
@@ -39,6 +41,10 @@ class ThemeServiceTest : public ExtensionServiceTestBase {
     ExtensionServiceTestBase::SetUp();
     InitializeEmptyExtensionService();
   }
+
+  const CustomThemeSupplier* GetThemeSupplier(ThemeService* theme_service) {
+    return theme_service->get_theme_supplier();
+  }
 };
 
 // Installs then uninstalls a theme and makes sure that the ThemeService
@@ -85,4 +91,16 @@ TEST_F(ThemeServiceTest, ThemeUpgrade) {
   EXPECT_FALSE(theme_service->UsingDefaultTheme());
 }
 
-}; // namespace
+// Checks that managed users have their own default theme.
+TEST_F(ThemeServiceTest, ManagedUserTheme) {
+  profile_->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true);
+  ThemeService* theme_service =
+      ThemeServiceFactory::GetForProfile(profile_.get());
+  theme_service->UseDefaultTheme();
+  EXPECT_TRUE(theme_service->UsingDefaultTheme());
+  EXPECT_TRUE(GetThemeSupplier(theme_service));
+  EXPECT_EQ(GetThemeSupplier(theme_service)->GetThemeType(),
+            CustomThemeSupplier::MANAGED_USER_THEME);

[pkotwicz, 2013/07/22 20:17:28]

Nice test.

Can you also add a test for the behavior on systems which use the system/native
theme by default?

[Adrian Kuegel, 2013/07/23 08:13:29]

Done.

+}
+
+}; // namespace theme_service_test_internal