Revert of Re-enable fetching component policies for login screen apps

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 225 matching lines @@
 
 void DeviceCloudPolicyManagerChromeOS::StartConnection(
     std::unique_ptr<CloudPolicyClient> client_to_connect,
     chromeos::InstallAttributes* install_attributes) {
   CHECK(!service());
 
   // Set state keys here so the first policy fetch submits them to the server.
   if (ForcedReEnrollmentEnabled())
     client_to_connect->SetStateKeysToUpload(state_keys_broker_->state_keys());
 
-  // Create the component cloud policy service for fetching, caching and
-  // exposing policy for extensions.
-  if (!component_policy_disabled_for_testing_) {
+  if (is_component_policy_enabled_) {
     base::FilePath component_policy_cache_dir;
     CHECK(PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY,
                            &component_policy_cache_dir));
     CHECK(signin_profile_forwarding_schema_registry_);
     CreateComponentCloudPolicyService(
         dm_protocol::kChromeSigninExtensionPolicyType,
         component_policy_cache_dir, g_browser_process->system_request_context(),
         client_to_connect.get(),
         signin_profile_forwarding_schema_registry_.get());
   }
@@ skipping 106 matching lines @@
       base::MakeUnique<DeviceStatusCollector>(
           local_state_, chromeos::system::StatisticsProvider::GetInstance(),
           DeviceStatusCollector::VolumeInfoFetcher(),
           DeviceStatusCollector::CPUStatisticsFetcher(),
           DeviceStatusCollector::CPUTempFetcher(),
           DeviceStatusCollector::AndroidStatusFetcher()),
       task_runner_));
 }
 
 }  // namespace policy