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

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 0cf60a0c469e102ffdaab70a3e225a42925a6d1d..d2835cf19719a5ec48af835d756f823d7718c013 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -444,7 +444,7 @@ class MockProviderVisitor
 
 ExtensionServiceTestBase::ExtensionServiceInitParams::
 ExtensionServiceInitParams()
- : autoupdate_enabled(false), is_first_run(true) {
+    : autoupdate_enabled(false), is_first_run(true), profile_is_managed(false) {
 }
 
 // Our message loop may be used in tests which require it to be an IO loop.
@@ -482,6 +482,10 @@ void ExtensionServiceTestBase::InitializeExtensionService(
     chrome::RegisterUserProfilePrefs(registry.get());
     profile_builder.SetPrefService(prefs.Pass());
   }
+
+  if (params.profile_is_managed)
+    profile_builder.SetManagedUserId("asdf");
+
   profile_builder.SetPath(params.profile_path);
   profile_ = profile_builder.Build();
 
@@ -554,7 +558,9 @@ void ExtensionServiceTestBase::InitializeGoodInstalledExtensionService() {
 }
 
 void ExtensionServiceTestBase::InitializeEmptyExtensionService() {
-  InitializeExtensionServiceHelper(false, true);
+  ExtensionServiceInitParams params;
+  InitializeExtensionServiceParams(&params);
+  InitializeExtensionService(params);
 }
 
 void ExtensionServiceTestBase::InitializeExtensionProcessManager() {
@@ -564,12 +570,15 @@ void ExtensionServiceTestBase::InitializeExtensionProcessManager() {
 }
 
 void ExtensionServiceTestBase::InitializeExtensionServiceWithUpdater() {
-  InitializeExtensionServiceHelper(true, true);
+  ExtensionServiceInitParams params;
+  InitializeExtensionServiceParams(&params);
+  params.autoupdate_enabled = true;
+  InitializeExtensionService(params);
   service_->updater()->Start();
 }
 
-void ExtensionServiceTestBase::InitializeExtensionServiceHelper(
-    bool autoupdate_enabled, bool is_first_run) {
+void ExtensionServiceTestBase::InitializeExtensionServiceParams(
+    ExtensionServiceInitParams* params) {
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   base::FilePath path = temp_dir_.path();
   path = path.Append(FILE_PATH_LITERAL("TestingExtensionsPath"));
@@ -581,13 +590,9 @@ void ExtensionServiceTestBase::InitializeExtensionServiceHelper(
   base::DeleteFile(extensions_install_dir_, true);
   file_util::CreateDirectory(extensions_install_dir_);
 
-  ExtensionServiceInitParams params;
-  params.profile_path = path;
-  params.pref_file = prefs_filename;
-  params.extensions_install_dir = extensions_install_dir_;
-  params.autoupdate_enabled = autoupdate_enabled;
-  params.is_first_run = is_first_run;
-  InitializeExtensionService(params);
+  params->profile_path = path;
+  params->pref_file = prefs_filename;
+  params->extensions_install_dir = extensions_install_dir_;
 }
 
 // static
@@ -6352,7 +6357,10 @@ TEST_F(ExtensionServiceTest, ExternalInstallUpdatesFromWebstoreOldProfile) {
 
   // This sets up the ExtensionPrefs used by our ExtensionService to be
   // post-first run.
-  InitializeExtensionServiceHelper(false, false);
+  ExtensionServiceInitParams params;
+  InitializeExtensionServiceParams(&params);
+  params.is_first_run = false;
+  InitializeExtensionService(params);
 
   base::FilePath crx_path = temp_dir_.path().AppendASCII("webstore.crx");
   PackCRX(data_dir_.AppendASCII("update_from_webstore"),