Remove uses of ENABLE_CONFIGURATION_POLICY from src/chrome.

chrome/browser/policy/profile_policy_connector_factory.cc

Index: chrome/browser/policy/profile_policy_connector_factory.cc
diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc
index 11a591e783963692731d2b3c58d8603cee78f6e8..1bf9210d6b56a7294a60ba9f1129ed4469a4e504 100644
--- a/chrome/browser/policy/profile_policy_connector_factory.cc
+++ b/chrome/browser/policy/profile_policy_connector_factory.cc
@@ -10,25 +10,23 @@
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
+#include "chrome/browser/policy/schema_registry_service.h"
+#include "chrome/browser/policy/schema_registry_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/policy/core/common/policy_service.h"
-
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "chrome/browser/policy/schema_registry_service.h"
-#include "chrome/browser/policy/schema_registry_service_factory.h"
 #include "components/policy/core/common/policy_service_impl.h"
+
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user.h"
-#else
+#else  // Non-ChromeOS.
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #endif
-#endif
 
 namespace policy {
 
@@ -60,25 +58,21 @@ void ProfilePolicyConnectorFactory::SetServiceForTesting(
   map_entry = connector;
 }
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
 void ProfilePolicyConnectorFactory::PushProviderForTesting(
     ConfigurationPolicyProvider* provider) {
   test_providers_.push_back(provider);
 }
-#endif
 
 ProfilePolicyConnectorFactory::ProfilePolicyConnectorFactory()
     : BrowserContextKeyedBaseFactory(
         "ProfilePolicyConnector",
         BrowserContextDependencyManager::GetInstance()) {
-#if defined(ENABLE_CONFIGURATION_POLICY)
   DependsOn(SchemaRegistryServiceFactory::GetInstance());
 #if defined(OS_CHROMEOS)
   DependsOn(UserCloudPolicyManagerFactoryChromeOS::GetInstance());
 #else
   DependsOn(UserCloudPolicyManagerFactory::GetInstance());
 #endif
-#endif
 }
 
 ProfilePolicyConnectorFactory::~ProfilePolicyConnectorFactory() {
@@ -103,7 +97,6 @@ ProfilePolicyConnectorFactory::CreateForBrowserContextInternal(
     bool force_immediate_load) {
   DCHECK(connectors_.find(context) == connectors_.end());
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
   SchemaRegistry* schema_registry = nullptr;
   CloudPolicyManager* user_cloud_policy_manager = nullptr;
 
@@ -123,11 +116,9 @@ ProfilePolicyConnectorFactory::CreateForBrowserContextInternal(
   user_cloud_policy_manager =
       UserCloudPolicyManagerFactory::GetForBrowserContext(context);
 #endif  // defined(OS_CHROMEOS)
-#endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
   scoped_ptr<ProfilePolicyConnector> connector(new ProfilePolicyConnector());
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
   if (test_providers_.empty()) {
     connector->Init(
 #if defined(OS_CHROMEOS)
@@ -141,9 +132,6 @@ ProfilePolicyConnectorFactory::CreateForBrowserContextInternal(
     scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers));
     connector->InitForTesting(std::move(service));
   }
-#else
-  connector->Init(nullptr, nullptr);
-#endif
 
   connectors_[context] = connector.get();
   return connector;