Add DeviceADPolicyManager to provide AD policy.

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 21 matching lines @@
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace policy {
 
 class AffiliatedCloudPolicyInvalidator;
 class AffiliatedInvalidationServiceProvider;
 class AffiliatedRemoteCommandsInvalidator;
 class BluetoothPolicyHandler;
+class DeviceADPolicyManager;
 class DeviceCloudPolicyInitializer;
 class DeviceLocalAccountPolicyService;
 class DeviceManagementService;
 struct EnrollmentConfig;
 class NetworkConfigurationUpdater;
 class ProxyPolicyProvider;
 class ServerBackedStateKeysBroker;
 
 // Extends ChromeBrowserPolicyConnector with the setup specific to Chrome OS.
 class BrowserPolicyConnectorChromeOS
@@ skipping 16 matching lines @@
 
   void Shutdown() override;
 
   // Returns true if this device is managed by an enterprise (as opposed to
   // a local owner).
   bool IsEnterpriseManaged() const;
 
   // Returns the enterprise domain if device is managed.
   std::string GetEnterpriseDomain() const;
 
+  // Returns the Kerberos realm (aka Windows Domain) if the device is managed by
+  // Active Directory.
   std::string GetRealm() const;
 
   // Returns the device asset ID if it is set.
   std::string GetDeviceAssetID() const;
 
   // Returns the cloud directory API ID or an empty string if it is not set.
   std::string GetDirectoryApiID() const;
 
   // Returns the device mode. For Chrome OS this function will return the mode
   // stored in the lockbox, or DEVICE_MODE_CONSUMER if the lockbox has been
   // locked empty, or DEVICE_MODE_UNKNOWN if the device has not been owned yet.
   // For other OSes the function will always return DEVICE_MODE_CONSUMER.
   DeviceMode GetDeviceMode() const;
 
   // Get the enrollment configuration for the device as decided by various
   // factors. See DeviceCloudPolicyInitializer::GetPrescribedEnrollmentConfig()
   // for details.
   EnrollmentConfig GetPrescribedEnrollmentConfig() const;
 
+  // May be nullptr, eg. for AD-managed devices.

[emaxx, 2016/11/11 15:25:08]

nit: I think either "eg" or "e.g." should be used. But maybe I'm wrong.

[Thiemo Nagel, 2016/11/16 19:11:01]

Good point, I wasn't aware of that!  I guess I'm guilty of writing "eg." in many
many places...

   DeviceCloudPolicyManagerChromeOS* GetDeviceCloudPolicyManager() const {
     return device_cloud_policy_manager_;
   }
 
+  // May be nullptr, eg. for non-AD-managed devices.
+  DeviceADPolicyManager* GetDeviceADPolicyManager() const {
+    return device_ad_policy_manager_;
+  }
+
+  // May be nullptr.
   DeviceCloudPolicyInitializer* GetDeviceCloudPolicyInitializer() const {
     return device_cloud_policy_initializer_.get();
   }
 
+  // May be nullptr, eg. for AD-managed devices.
   DeviceLocalAccountPolicyService* GetDeviceLocalAccountPolicyService() const {
     return device_local_account_policy_service_.get();
   }
 
   chromeos::InstallAttributes* GetInstallAttributes() const {
     return install_attributes_.get();
   }
 
+  // May be nullptr, eg. for AD-managed devices.
   ServerBackedStateKeysBroker* GetStateKeysBroker() const {
     return state_keys_broker_.get();
   }
 
   // The browser-global PolicyService is created before Profiles are ready, to
   // provide managed values for the local state PrefService. It includes a
   // policy provider that forwards policies from a delegate policy provider.
   // This call can be used to set the user policy provider as that delegate
   // once the Profile is ready, so that user policies can also affect local
   // state preferences.
@@ skipping 33 matching lines @@
   // Creates an attestation flow using our async method handler and
   // cryptohome client.
   std::unique_ptr<chromeos::attestation::AttestationFlow>
   CreateAttestationFlow();
 
   // Components of the device cloud policy implementation.
   std::unique_ptr<ServerBackedStateKeysBroker> state_keys_broker_;
   std::unique_ptr<chromeos::InstallAttributes> install_attributes_;
   std::unique_ptr<AffiliatedInvalidationServiceProvider>
       affiliated_invalidation_service_provider_;
-  DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_;
+  DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_ = nullptr;
+  DeviceADPolicyManager* device_ad_policy_manager_ = nullptr;
   PrefService* local_state_;
   std::unique_ptr<DeviceCloudPolicyInitializer>
       device_cloud_policy_initializer_;
   std::unique_ptr<DeviceLocalAccountPolicyService>
       device_local_account_policy_service_;
   std::unique_ptr<AffiliatedCloudPolicyInvalidator>
       device_cloud_policy_invalidator_;
   std::unique_ptr<AffiliatedRemoteCommandsInvalidator>
       device_remote_commands_invalidator_;
 
   std::unique_ptr<BluetoothPolicyHandler> bluetooth_policy_handler_;
 
   // This policy provider is used on Chrome OS to feed user policy into the
   // global PolicyService instance. This works by installing the cloud policy
   // provider of the primary profile as the delegate of the ProxyPolicyProvider,
   // after login.
   // The provider is owned by the base class; this field is just a typed weak
   // pointer to get to the ProxyPolicyProvider at SetUserPolicyDelegate().
-  ProxyPolicyProvider* global_user_cloud_policy_provider_;
+  ProxyPolicyProvider* global_user_cloud_policy_provider_ = nullptr;
 
   std::unique_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
 
   base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnectorChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_