Move session service and supervised users to buildflags.

build/config/features.gni

 # 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.
 
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
 #
 # These flags are effectively global. Your feature flag should go near the
 # code it controls. Most of these items are here now because they control
@@ skipping 32 matching lines @@
   # Enables WebRTC.
   enable_webrtc = !is_ios
 
   # Enables the Media Router.
   enable_media_router = !is_ios && !is_chromecast
 
   # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4.
   # We always build Google Chrome and Chromecast with proprietary codecs.
   proprietary_codecs = is_chrome_branded || is_chromecast
 
-  # 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
-
   # Variable safe_browsing is used to control the build time configuration for
   # safe browsing feature. Safe browsing can be compiled in 3 different levels:
   # 0 disables it, 1 enables it fully, and 2 enables mobile protection via an
   # external API.
   if (is_ios || is_chromecast) {
     safe_browsing_mode = 0
   } else if (is_android) {
     safe_browsing_mode = 2
   } else {
     safe_browsing_mode = 1
@@ skipping 84 matching lines @@
 
 enable_configuration_policy = !is_ios
 
 enable_mac_keystone = is_mac && is_chrome_branded && is_official_build
 #
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
 #
 # See comment at the top.