Move session service and supervised users to buildflags.

chrome/common/features.gni

 # 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//net/features.gni")
 
@@ skipping 33 matching lines @@
       is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
 
   # Set to true to bundle all the mash related mojo services into chrome.
   # Specify --mash to chrome to have chrome start the mash environment.
   enable_package_mash_services = is_chromeos
 
   enable_plugin_installation = is_win || is_mac
 
   enable_service_discovery = enable_mdns || is_mac
 
+  # Enables use of the session service, which is enabled by default.
+  # Android stores them separately on the Java side.
+  enable_session_service = !is_android && !is_ios && !is_chromecast
+
+  enable_supervised_users = !is_ios && !is_chromecast
+
   # Enables vr shell.
   enable_vr_shell = false
 
   # Enables vr shell UI development on local or remote page.
   enable_vr_shell_ui_dev = false
 
   # Enable native notifications via XPC services (mac only).
   enable_xpc_notifications = false
 
   # Indicates if the build is using PGO.
   pgo_build = chrome_pgo_phase > 0
 
   # Use vulcanized HTML/CSS/JS resources to speed up WebUI (chrome://)
   # pages. https://github.com/polymer/vulcanize
   use_vulcanize = true
 }
 
 chrome_grit_defines = [
   "enable_app_list=$enable_app_list",
   "enable_background=$enable_background",
   "enable_google_now=$enable_google_now",
   "enable_hangout_services_extension=$enable_hangout_services_extension",
   "enable_hotwording=$enable_hotwording",
   "enable_service_discovery=$enable_service_discovery",
   "enable_vr_shell=$enable_vr_shell",
   "enable_webvr=$enable_webvr",
   "safe_browsing_mode=$safe_browsing_mode",
   "use_vulcanize=$use_vulcanize",
 ]