Mark supervised profiles as such immediately when they're created.

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/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
 #include "chrome/browser/extensions/unpacked_installer.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/chrome_paths.h"
 #include "chrome/common/extensions/extension.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 "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace theme_service_internal {
 
 class ThemeServiceTest : public ExtensionServiceTestBase {
  public:
-  ThemeServiceTest() {
-    manager_.reset(
-        new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
-  }
+  ThemeServiceTest() : is_managed_(false),
+                        manager_(TestingBrowserProcess::GetGlobal()) {}

[pkotwicz, 2013/10/17 16:49:09]

Nit: one space too many

[Bernhard Bauer, 2013/10/17 16:55:03]

Done.

   virtual ~ThemeServiceTest() {}
 
   // Moves a minimal theme to |temp_dir_path| and unpacks it from that
   // directory.
   std::string LoadUnpackedThemeAt(const base::FilePath& temp_dir) {
     base::FilePath dst_manifest_path = temp_dir.AppendASCII("manifest.json");
     base::FilePath test_data_dir;
     EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
     base::FilePath src_manifest_path =
         test_data_dir.AppendASCII("extensions/theme_minimal/manifest.json");
@@ skipping 31 matching lines @@
         content::Source<Profile>(profile_.get()));
     installer->Load(path);
     observer.Wait();
 
     // Let the ThemeService finish creating the theme pack.
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   virtual void SetUp() {
     ExtensionServiceTestBase::SetUp();
-    InitializeEmptyExtensionService();
+    ExtensionServiceTestBase::ExtensionServiceInitParams params =
+        CreateDefaultInitParams();
+    params.profile_is_managed = is_managed_;
+    InitializeExtensionService(params);
     service_->Init();
-    bool success = manager_->SetUp();
-    ASSERT_TRUE(success);
+    ASSERT_TRUE(manager_.SetUp());
   }
 
   const CustomThemeSupplier* get_theme_supplier(ThemeService* theme_service) {
     return theme_service->get_theme_supplier();
   }
 
   TestingProfileManager* manager() {
-    return manager_.get();
+    return &manager_;
   }
 
+ protected:
+  bool is_managed_;
+
  private:
-  scoped_ptr<TestingProfileManager> manager_;
+  TestingProfileManager manager_;
+};
+
+class ThemeServiceManagedUserTest : public ThemeServiceTest {

[pkotwicz, 2013/10/17 16:49:09]

Nit: Move ThemeServiceManagedUserTest above the ThemeServiceManagedUserTests

[Bernhard Bauer, 2013/10/17 16:55:03]

Done.

+ public:
+  virtual void SetUp() OVERRIDE {
+    is_managed_ = true;
+    ThemeServiceTest::SetUp();
+  }
 };
 
 // Installs then uninstalls a theme and makes sure that the ThemeService
 // reverts to the default theme after the uninstall.
 TEST_F(ThemeServiceTest, ThemeInstallUninstall) {
   ThemeService* theme_service =
       ThemeServiceFactory::GetForProfile(profile_.get());
   theme_service->UseDefaultTheme();
   // Let the ThemeService uninstall unused themes.
   base::MessageLoop::current()->RunUntilIdle();
@@ skipping 110 matching lines @@
       ExtensionService::INCLUDE_DISABLED));
 
   // 2) Upgrading a disabled theme should not change the current theme.
   UpdateUnpackedTheme(extension1_id);
   EXPECT_EQ(extension2_id, theme_service->GetThemeID());
   EXPECT_TRUE(service_->GetExtensionById(extension1_id,
       ExtensionService::INCLUDE_DISABLED));
 }
 
 // Checks that managed users have their own default theme.
-TEST_F(ThemeServiceTest, ManagedUserThemeReplacesDefaultTheme) {
-  ManagedUserServiceFactory::GetForProfile(profile_.get())->InitForTesting();
+TEST_F(ThemeServiceManagedUserTest, ManagedUserThemeReplacesDefaultTheme) {
   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) {
-  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) {
-  ManagedUserServiceFactory::GetForProfile(profile_.get())->InitForTesting();
+TEST_F(ThemeServiceManagedUserTest, ManagedUserThemeReplacesNativeTheme) {
   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
+

[pkotwicz, 2013/10/17 16:49:09]

Nit: Extra line is unnecessary

[Bernhard Bauer, 2013/10/17 16:55:03]

Removed.