Make it possible to build without enable_supervised_users.

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index c9c6d7cf425055c50903765aed9d30867b71e0ad..25eca89000d826e4ccd5666e299e922c27b15de4 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -41,7 +41,6 @@
 #include "chrome/browser/chrome_device_client.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/component_updater/chrome_component_updater_configurator.h"
-#include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/devtools/devtools_auto_opener.h"
 #include "chrome/browser/devtools/remote_debugging_server.h"
@@ -168,6 +167,10 @@
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
 
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+#include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
+#endif
+
 #if BUILDFLAG(ENABLE_WEBRTC)
 #include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
 #endif
@@ -318,9 +321,11 @@ void BrowserProcessImpl::StartTearDown() {
   // those things during teardown.
   notification_ui_manager_.reset();
 
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // The SupervisedUserWhitelistInstaller observes the ProfileAttributesStorage,
   // so it needs to be shut down before the ProfileManager.
   supervised_user_whitelist_installer_.reset();
+#endif
 
   // Debugger must be cleaned up before ProfileManager.
   remote_debugging_server_.reset();
@@ -982,6 +987,7 @@ BrowserProcessImpl::pnacl_component_installer() {
 
 component_updater::SupervisedUserWhitelistInstaller*
 BrowserProcessImpl::supervised_user_whitelist_installer() {
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   if (!supervised_user_whitelist_installer_) {
     supervised_user_whitelist_installer_ =
         component_updater::SupervisedUserWhitelistInstaller::Create(
@@ -990,6 +996,9 @@ BrowserProcessImpl::supervised_user_whitelist_installer() {
             local_state());
   }
   return supervised_user_whitelist_installer_.get();
+#else
+  return nullptr;
+#endif
 }
 
 void BrowserProcessImpl::ResourceDispatcherHostCreated() {