Replace the WAS_INSTALLED_BY_CUSTODIAN creation flag with a pref

chrome/browser/safe_browsing/incident_reporting/extension_data_collection.cc

 // Copyright 2015 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/safe_browsing/incident_reporting/extension_data_collection.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/stl_util.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/install_signer.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_factory.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_constants.h"
@@ skipping 28 matching lines @@
     extension_info->set_state(Info::STATE_TERMINATED);
 
   extension_info->set_type(extension.GetType());
   std::string update_url;
   if (extension.manifest()->GetString(extensions::manifest_keys::kUpdateURL,
                                       &update_url)) {
     extension_info->set_update_url(update_url);
   }
 
   extension_info->set_installed_by_custodian(
-      extension.was_installed_by_custodian());
+      extensions::util::WasInstalledByCustodian(
+          extension.id(), extension_registry.browser_context()));
   extension_info->set_installed_by_default(
       extension.was_installed_by_default());
   extension_info->set_installed_by_oem(extension.was_installed_by_oem());
   extension_info->set_from_bookmark(extension.from_bookmark());
   extension_info->set_from_webstore(extension.from_webstore());
   extension_info->set_converted_from_user_script(
       extension.converted_from_user_script());
   extension_info->set_may_be_untrusted(extension.may_be_untrusted());
   extension_info->set_install_time_msec(
       extension_prefs.GetInstallTime(extension.id()).ToJavaTime());
@@ skipping 59 matching lines @@
         *last_installed_extension,
         *extensions::ExtensionPrefs::Get(profile_for_last_installed_extension),
         *extensions::ExtensionRegistryFactory::GetForBrowserContext(
             profile_for_last_installed_extension),
         data->mutable_last_installed_extension());
   }
 #endif
 }
 
 }  // namespace safe_browsing