Start authpolicyd

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

 // 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.
 
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 27 matching lines @@
 #include "chrome/browser/chromeos/settings/install_attributes.h"
 #include "chrome/browser/policy/device_management_service_configuration.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/attestation/attestation_flow.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/upstart_client.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/settings/cros_settings_provider.h"
 #include "chromeos/settings/timezone_settings.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
 #include "components/policy/core/common/proxy_policy_provider.h"
 #include "components/policy/proto/device_management_backend.pb.h"
@@ skipping 45 matching lines @@
                              &install_attrs_file));
       install_attributes_->Init(install_attrs_file);
     }
 
     std::unique_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store =
         base::MakeUnique<DeviceCloudPolicyStoreChromeOS>(
             chromeos::DeviceSettingsService::Get(), install_attributes_.get(),
             GetBackgroundTaskRunner());
 
     if (install_attributes_->IsActiveDirectoryManaged()) {
+      chromeos::DBusThreadManager* thread_manager =
+          chromeos::DBusThreadManager::Get();
+      DCHECK(thread_manager);

[Alexander Alekseev, 2016/12/01 09:02:20]

nit: remove DCHECK

According to
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md...
:

- A consequence of this is that you should not handle DCHECK() failures, even if
failure would result in a crash. 

[Roman Sorokin (ftl), 2016/12/01 13:18:56]

Done.

[Thiemo Nagel, 2016/12/01 13:33:51]

I'm fine with removing the DCHECK(), but just for the record, what you write is
not the intention of "you should not handle DCHECK() failure".

// Good.
DCHECK(ptr);
ptr->DoSomething();

// Bad.  You should not handle DCHECK() failure.
DCHECK(ptr);
if (ptr)
  ptr->DoSomething();

[Alexander Alekseev, 2016/12/02 01:10:34]

Yes, I actually agree with you. I just got used to "never DCHECK pointers if it
is going to crash on the next line". But we can put it back if you think (as
owner) that they are helpful here.

+      chromeos::UpstartClient* upstart_client =
+          thread_manager->GetUpstartClient();
+      DCHECK(upstart_client);

[Alexander Alekseev, 2016/12/01 09:02:20]

Ditto.

[Roman Sorokin (ftl), 2016/12/01 13:18:56]

Done.

+      upstart_client->StartAuthPolicyService();
+
       device_active_directory_policy_manager_ =
           new DeviceActiveDirectoryPolicyManager(
               std::move(device_cloud_policy_store));
       AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>(
           device_active_directory_policy_manager_));
     } else {
       state_keys_broker_ = base::MakeUnique<ServerBackedStateKeysBroker>(
           chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
           base::ThreadTaskRunnerHandle::Get());
 
@@ skipping 239 matching lines @@
         device_cloud_policy_manager_->device_store()->policy();
     if (policy_data) {
       affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
                              policy_data->device_affiliation_ids().end());
     }
   }
   return affiliation_ids;
 }
 
 }  // namespace policy