Replace the WAS_INSTALLED_BY_CUSTODIAN creation flag with a pref

chrome/browser/supervised_user/supervised_user_service_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_service_unittest.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
index 06e2dc2164a3641d4fd786842f8720a88617f305..03fd528c068249dc6763295910507599013ed6d9 100644
--- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
@@ -41,6 +41,7 @@
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "extensions/common/extension.h"
@@ -407,14 +408,15 @@ class SupervisedUserServiceExtensionTestBase
             .Set(extensions::manifest_keys::kName, "Extension")
             .Set(extensions::manifest_keys::kVersion, "1.0")
             .Build();
-    int creation_flags = extensions::Extension::NO_FLAGS;
-    if (by_custodian)
-      creation_flags |= extensions::Extension::WAS_INSTALLED_BY_CUSTODIAN;
+
     extensions::ExtensionBuilder builder;
     scoped_refptr<extensions::Extension> extension =
         builder.SetManifest(std::move(manifest))
-            .AddFlags(creation_flags)
             .Build();
+    if (by_custodian)
+      extensions::util::SetWasInstalledByCustodian(extension->id(),

[Marc Treib, 2016/06/16 12:35:39]

braces

[mamir, 2016/06/17 08:33:18]

Done.

+                                                   profile_.get(), true);
+
     return extension;
   }