Create new c/b/c/policy/active_directory directory

chrome/browser/chromeos/policy contains too many files.
Move all files inside chrome/browser/chromeos/policy that
relate to Active Directory into a newly created directory.

Bug: 1209781
Test: unit_tests --gtest_filter=*ActiveDirectoryPolicy*
Test: browser_tests --gtest_filter=*ActiveDirectoryPolicy*
Change-Id: If477627b8c2b3094943bb729184be51dfb29e9c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2933836
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Philipp Weiß <phweiss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#889292}

chrome/browser/ash/login/enrollment/enrollment_screen.h

@@ -21,7 +21,7 @@
 #include "chrome/browser/ash/login/screen_manager.h"
 #include "chrome/browser/ash/login/screens/base_screen.h"
 #include "chrome/browser/ash/login/wizard_context.h"
-#include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_join_delegate.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/enterprise_metrics.h"

chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h

@@ -12,7 +12,7 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 // TODO(https://crbug.com/1164001): move to forward declaration
-#include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_join_delegate.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 

chrome/browser/ash/login/test/enrollment_helper_mixin.cc

@@ -9,7 +9,7 @@
 #include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h"
 #include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h"
 #include "chrome/browser/ash/login/wizard_controller.h"
-#include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_join_delegate.h"
 
 using testing::_;
 using testing::AtLeast;

chrome/browser/chromeos/BUILD.gn

@@ -2563,9 +2563,13 @@ source_set("chromeos") {
     "platform_keys/platform_keys_service_factory.cc",
     "platform_keys/platform_keys_service_factory.h",
     "platform_keys/platform_keys_service_nss.cc",
-    "policy/active_directory_join_delegate.h",
-    "policy/active_directory_policy_manager.cc",
-    "policy/active_directory_policy_manager.h",
+    "policy/active_directory/active_directory_join_delegate.h",
+    "policy/active_directory/active_directory_policy_manager.cc",
+    "policy/active_directory/active_directory_policy_manager.h",
+    "policy/active_directory/component_active_directory_policy_retriever.cc",
+    "policy/active_directory/component_active_directory_policy_retriever.h",
+    "policy/active_directory/component_active_directory_policy_service.cc",
+    "policy/active_directory/component_active_directory_policy_service.h",
     "policy/adb_sideloading_allowance_mode_policy_handler.cc",
     "policy/adb_sideloading_allowance_mode_policy_handler.h",
     "policy/affiliated_cloud_policy_invalidator.cc",
@@ -2585,10 +2589,6 @@ source_set("chromeos") {
     "policy/browser_policy_connector_chromeos.h",
     "policy/cached_policy_key_loader_chromeos.cc",
     "policy/cached_policy_key_loader_chromeos.h",
-    "policy/component_active_directory_policy_retriever.cc",
-    "policy/component_active_directory_policy_retriever.h",
-    "policy/component_active_directory_policy_service.cc",
-    "policy/component_active_directory_policy_service.h",
     "policy/configuration_policy_handler_chromeos.cc",
     "policy/configuration_policy_handler_chromeos.h",
     "policy/device_cloud_policy_initializer.cc",
@@ -4068,7 +4068,9 @@ source_set("unit_tests") {
     "phonehub/browser_tabs_model_provider_impl_unittest.cc",
     "platform_keys/key_permissions/arc_key_permissions_manager_delegate_unittest.cc",
     "platform_keys/key_permissions/key_permissions_service_impl_unittest.cc",
-    "policy/active_directory_policy_manager_unittest.cc",
+    "policy/active_directory/active_directory_policy_manager_unittest.cc",
+    "policy/active_directory/component_active_directory_policy_retriever_unittest.cc",
+    "policy/active_directory/component_active_directory_policy_service_unittest.cc",
     "policy/adb_sideloading_allowance_mode_policy_handler_unittest.cc",
     "policy/affiliated_cloud_policy_invalidator_unittest.cc",
     "policy/affiliated_invalidation_service_provider_impl_unittest.cc",
@@ -4076,8 +4078,6 @@ source_set("unit_tests") {
     "policy/auto_enrollment_client_impl_unittest.cc",
     "policy/bluetooth_policy_handler_unittest.cc",
     "policy/cached_policy_key_loader_chromeos_unittest.cc",
-    "policy/component_active_directory_policy_retriever_unittest.cc",
-    "policy/component_active_directory_policy_service_unittest.cc",
     "policy/configuration_policy_handler_chromeos_unittest.cc",
     "policy/device_cloud_policy_initializer_unittest.cc",
     "policy/device_cloud_policy_manager_chromeos_unittest.cc",

chrome/browser/chromeos/policy/active_directory/active_directory_join_delegate.h

@@ -2,8 +2,8 @@
 // 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_ACTIVE_DIRECTORY_JOIN_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_JOIN_DELEGATE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_ACTIVE_DIRECTORY_JOIN_DELEGATE_H_
+#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_ACTIVE_DIRECTORY_JOIN_DELEGATE_H_
 
 #include <string>
 
@@ -46,4 +46,4 @@ using ::chromeos::ActiveDirectoryJoinDelegate;
 using ::chromeos::OnDomainJoinedCallback;
 }  // namespace ash
 
-#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_JOIN_DELEGATE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_ACTIVE_DIRECTORY_JOIN_DELEGATE_H_

chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 
 #include <string>
 #include <utility>

chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h

@@ -2,8 +2,8 @@
 // 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_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
 
 #include <memory>
 
@@ -12,7 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/chromeos/policy/component_active_directory_policy_service.h"
+#include "chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_service.h"
 #include "components/account_id/account_id.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/configuration_policy_provider.h"
@@ -240,4 +240,4 @@ class DeviceActiveDirectoryPolicyManager : public ActiveDirectoryPolicyManager {
 
 }  // namespace policy
 
-#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_

chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 
 #include <memory>
 #include <string>

chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_retriever.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/policy/component_active_directory_policy_retriever.h"
+#include "chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_retriever.h"
 
 #include "base/bind.h"
 #include "base/logging.h"

chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_retriever.h

@@ -2,8 +2,8 @@
 // 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_COMPONENT_ACTIVE_DIRECTORY_POLICY_RETRIEVER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_COMPONENT_ACTIVE_DIRECTORY_POLICY_RETRIEVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_COMPONENT_ACTIVE_DIRECTORY_POLICY_RETRIEVER_H_
+#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_COMPONENT_ACTIVE_DIRECTORY_POLICY_RETRIEVER_H_
 
 #include <string>
 #include <vector>
@@ -91,4 +91,4 @@ class ComponentActiveDirectoryPolicyRetriever {
 
 }  // namespace policy
 
-#endif  // CHROME_BROWSER_CHROMEOS_POLICY_COMPONENT_ACTIVE_DIRECTORY_POLICY_RETRIEVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_COMPONENT_ACTIVE_DIRECTORY_POLICY_RETRIEVER_H_

chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_retriever_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/policy/component_active_directory_policy_retriever.h"
+#include "chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_retriever.h"
 
 #include "base/bind.h"
 #include "base/test/task_environment.h"

chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_service.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/policy/component_active_directory_policy_service.h"
+#include "chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_service.h"
 
 #include <iterator>
 

chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_service.h

@@ -2,8 +2,8 @@
 // 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_COMPONENT_ACTIVE_DIRECTORY_POLICY_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_COMPONENT_ACTIVE_DIRECTORY_POLICY_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_COMPONENT_ACTIVE_DIRECTORY_POLICY_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_COMPONENT_ACTIVE_DIRECTORY_POLICY_SERVICE_H_
 
 #include <memory>
 #include <string>
@@ -13,7 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "chrome/browser/chromeos/policy/component_active_directory_policy_retriever.h"
+#include "chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_retriever.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_types.h"
 #include "components/policy/core/common/schema_registry.h"
@@ -129,4 +129,4 @@ class ComponentActiveDirectoryPolicyService : public SchemaRegistry::Observer {
 
 }  // namespace policy
 
-#endif  // CHROME_BROWSER_CHROMEOS_POLICY_COMPONENT_ACTIVE_DIRECTORY_POLICY_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_COMPONENT_ACTIVE_DIRECTORY_POLICY_SERVICE_H_

chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_service_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/policy/component_active_directory_policy_service.h"
+#include "chrome/browser/chromeos/policy/active_directory/component_active_directory_policy_service.h"
 
 #include "base/bind.h"
 #include "base/test/task_environment.h"

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

@@ -29,7 +29,7 @@
 #include "chrome/browser/ash/settings/cros_settings.h"
 #include "chrome/browser/ash/settings/device_settings_service.h"
 #include "chrome/browser/ash/system/timezone_util.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.h"
 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h"
 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.h"

chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc

@@ -21,7 +21,7 @@
 #include "chrome/browser/ash/login/enrollment/auto_enrollment_controller.h"
 #include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_join_delegate.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/dm_token_storage.h"
 #include "chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.h"

chrome/browser/chromeos/policy/user_policy_manager_builder_chromeos.cc

@@ -23,7 +23,7 @@
 #include "chrome/browser/ash/settings/cros_settings.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

chrome/browser/policy/chrome_policy_conversions_client.cc

@@ -37,7 +37,7 @@
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/ash/settings/cros_settings.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"

chrome/browser/policy/profile_policy_connector.cc

@@ -33,7 +33,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"

chrome/browser/policy/profile_policy_connector_builder.cc

@@ -18,7 +18,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #else  // Non-ChromeOS.
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"

chrome/browser/policy/schema_registry_service_builder.cc

@@ -19,7 +19,7 @@
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"

chrome/browser/profiles/profile_impl.cc

@@ -180,7 +180,7 @@
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/ash/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/locale_change_guard.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_policy_manager_builder_chromeos.h"
 #include "chrome/browser/chromeos/preferences.h"

chrome/browser/ui/webui/policy/policy_ui_handler.cc

@@ -91,7 +91,7 @@
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
+#include "chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"

chrome/test/BUILD.gn

@@ -3265,13 +3265,13 @@ if (!is_android) {
         "../browser/chromeos/platform_keys/platform_keys_service_browsertest.cc",
         "../browser/chromeos/platform_keys/platform_keys_service_test_util.cc",
         "../browser/chromeos/platform_keys/platform_keys_service_test_util.h",
+        "../browser/chromeos/policy/active_directory/component_active_directory_policy_browsertest.cc",
         "../browser/chromeos/policy/affiliation_mixin.cc",
         "../browser/chromeos/policy/affiliation_mixin.h",
         "../browser/chromeos/policy/affiliation_test_helper.cc",
         "../browser/chromeos/policy/affiliation_test_helper.h",
         "../browser/chromeos/policy/arc/unaffiliated_arc_allowed_browsertest.cc",
         "../browser/chromeos/policy/browser_policy_connector_chromeos_browsertest.cc",
-        "../browser/chromeos/policy/component_active_directory_policy_browsertest.cc",
         "../browser/chromeos/policy/device_cloud_policy_browsertest.cc",
         "../browser/chromeos/policy/device_local_account_browsertest.cc",
         "../browser/chromeos/policy/device_policy_cros_browser_test.cc",

docs/enterprise/active_directory_native_integration.md

@@ -62,7 +62,7 @@ to handle cancellation and other stuff. The
 [AuthPolicyCredentialsManager](https://cs.chromium.org/chromium/src/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.h)
 keeps track of user credential status, shows notifications if the Kerberos
 ticket expires and handles network connection changes. The
-[ActiveDirectoryPolicyManager](https://cs.chromium.org/chromium/src/chrome/browser/chromeos/policy/active_directory_policy_manager.h)
+[ActiveDirectoryPolicyManager](https://cs.chromium.org/chromium/src/chrome/browser/chromeos/policy/active_directory/active_directory_policy_manager.h)
 is the AD equivalent of the CloudPolicyManager and handles policy for AD-managed
 devices.