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

chrome/browser/profiles/profile_info_cache_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/profiles/profile_info_cache_unittest.h"
 
 #include <vector>
 
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 
 using content::BrowserThread;
 
 ProfileNameVerifierObserver::ProfileNameVerifierObserver(
     TestingProfileManager* testing_profile_manager)
@@ skipping 421 matching lines @@
   testing_profile_manager_.CreateTestingProfile(
       "test1", scoped_ptr<PrefServiceSyncable>(),
       managed_user_name, 0, "TEST_ID");
   for (size_t i = 0; i < GetCache()->GetNumberOfProfiles(); i++) {
     bool is_managed =
         GetCache()->GetNameOfProfileAtIndex(i) == managed_user_name;
     EXPECT_EQ(is_managed, GetCache()->ProfileIsManagedAtIndex(i));
     std::string managed_user_id = is_managed ? "TEST_ID" : "";
     EXPECT_EQ(managed_user_id, GetCache()->GetManagedUserIdOfProfileAtIndex(i));
   }
+
+  // Managed profiles have a custom theme, which needs to be deleted on the FILE
+  // thread. Reset the profile manager now so everything is deleted while we
+  // still have a FILE thread.
+  TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
 }
 
 TEST_F(ProfileInfoCacheTest, AddStubProfile) {
   EXPECT_EQ(0u, GetCache()->GetNumberOfProfiles());
 
   // Add some profiles with and without a '.' in their paths.
   const struct {
     const char* profile_path;
     const char* profile_name;
   } kTestCases[] = {
@@ skipping 16 matching lines @@
 
   ASSERT_EQ(4U, GetCache()->GetNumberOfProfiles());
 
   // Check that the profiles can be extracted from the local state.
   std::vector<string16> names = ProfileInfoCache::GetProfileNames();
   for (size_t i = 0; i < 4; i++)
     ASSERT_FALSE(names[i].empty());
 }
 
 }  // namespace