Notify ThemeService via callback when supervised user is ready.

chrome/browser/themes/theme_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include "base/json/json_reader.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
+#include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_service_factory.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_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace theme_service_internal {
 
 class ThemeServiceTest : public ExtensionServiceTestBase {
  public:
-  ThemeServiceTest() {}
+  ThemeServiceTest() {
+    manager_.reset(
+        new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
+  }
   virtual ~ThemeServiceTest() {}
 
   scoped_refptr<extensions::Extension> MakeThemeExtension(base::FilePath path) {
     DictionaryValue source;
     source.SetString(extension_manifest_keys::kName, "theme");
     source.Set(extension_manifest_keys::kTheme, new DictionaryValue());
     source.SetString(extension_manifest_keys::kUpdateURL, "http://foo.com");
     source.SetString(extension_manifest_keys::kVersion, "0.0.0.0");
     std::string error;
     scoped_refptr<extensions::Extension> extension =
         extensions::Extension::Create(
             path, extensions::Manifest::EXTERNAL_PREF_DOWNLOAD,
             source, extensions::Extension::NO_FLAGS, &error);
     EXPECT_TRUE(extension.get());
     EXPECT_EQ("", error);
     return extension;
   }
 
   virtual void SetUp() {
     ExtensionServiceTestBase::SetUp();
     InitializeEmptyExtensionService();
+    bool success = manager_->SetUp();
+    EXPECT_TRUE(success);

[pkotwicz, 2013/08/09 16:49:37]

Nit: ASSERT_TRUE() is probably more appropriate.

[Adrian Kuegel, 2013/08/09 21:21:59]

Done.

   }
 
   const CustomThemeSupplier* get_theme_supplier(ThemeService* theme_service) {
     return theme_service->get_theme_supplier();
   }
+
+  TestingProfileManager* manager() {
+    return manager_.get();
+  }
+
+ private:
+  scoped_ptr<TestingProfileManager> manager_;
 };
 
 // Installs then uninstalls a theme and makes sure that the ThemeService
 // reverts to the default theme after the uninstall.
 TEST_F(ThemeServiceTest, ThemeInstallUninstall) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   ThemeService* theme_service =
       ThemeServiceFactory::GetForProfile(profile_.get());
   theme_service->UseDefaultTheme();
@@ skipping 38 matching lines @@
   profile_->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true);
   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);
 }
 
+TEST_F(ThemeServiceTest, ManagedUserThemeNewUser) {

[pkotwicz, 2013/08/09 16:49:37]

I was hoping we could get a browsertest with a real profile. However, I am not
sure if that is possible and I will not block this CL on a test.
The lofty goal is that we would never have to change the test and the test would
stay valid regardless of how we change the order in which ThemeService gets
initialized relative to ExtensionService and ManagedUserService

[Adrian Kuegel, 2013/08/09 21:21:59]

Ok, I will try to write a browser test for this, but I guess it will be too late
for M30. Anyway, I agree it would be better to have a test that does not need to
be rewritten if we fix the initialization order.

+  TestingProfile* profile = manager()->CreateTestingProfile("mu");
+  // Simulate the current initialization behavior: first the ThemeService is
+  // created, then the supervised user profile is initialized.
+  ThemeService* theme_service =
+      ThemeServiceFactory::GetForProfile(profile);
+  ManagedUserServiceFactory::GetForProfile(profile)->InitForTesting();
+  EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),
+            CustomThemeSupplier::MANAGED_USER_THEME);
+  manager()->DeleteTestingProfile("mu");
+}
+
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // Checks that managed users don't use the system theme even if it is the
 // default. The system theme is only available on Linux.
 TEST_F(ThemeServiceTest, ManagedUserThemeReplacesNativeTheme) {
   profile_->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true);
   profile_->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true);
   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);
 }
 #endif
 
 }; // namespace theme_service_internal