Replace the WAS_INSTALLED_BY_CUSTODIAN creation flag with a pref

chrome/browser/supervised_user/supervised_user_service_unittest.cc

 // Copyright 2014 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/supervised_user/supervised_user_service.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 23 matching lines @@
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/version_info/version_info.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #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"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/manifest_constants.h"
 #endif
 
 using content::MessageLoopRunner;
 
 namespace {
@@ skipping 346 matching lines @@
         builder.SetManifest(std::move(source)).Build();
     return extension;
   }
 
   scoped_refptr<extensions::Extension> MakeExtension(bool by_custodian) {
     std::unique_ptr<base::DictionaryValue> manifest =
         extensions::DictionaryBuilder()
             .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();
+    extensions::util::SetWasInstalledByCustodian(extension->id(),
+                                                 profile_.get(), by_custodian);
+
     return extension;
   }
 
   bool is_supervised_;
   extensions::ScopedCurrentChannel channel_;
   SiteListObserver site_list_observer_;
   SupervisedUserURLFilterObserver url_filter_observer_;
 };
 
 class SupervisedUserServiceExtensionTestUnsupervised
@@ skipping 154 matching lines @@
   EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title());
   EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty());
 
   url_filter_observer_.Wait();
   EXPECT_EQ(SupervisedUserURLFilter::WARN,
             url_filter->GetFilteringBehaviorForURL(youtube_url));
   EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             url_filter->GetFilteringBehaviorForURL(moose_url));
 }
 #endif  // defined(ENABLE_EXTENSIONS)