Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Issue 2371213002: Refactor: Inject StatisticsProvider as a dependency of DeviceCloudPolicyInitializer. (Closed)
Patch Set: Address Maksim's comments. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chromeos/chromeos_switches.h" 42 #include "chromeos/chromeos_switches.h"
43 #include "chromeos/cryptohome/async_method_caller.h" 43 #include "chromeos/cryptohome/async_method_caller.h"
44 #include "chromeos/cryptohome/system_salt_getter.h" 44 #include "chromeos/cryptohome/system_salt_getter.h"
45 #include "chromeos/dbus/cryptohome_client.h" 45 #include "chromeos/dbus/cryptohome_client.h"
46 #include "chromeos/dbus/dbus_thread_manager.h" 46 #include "chromeos/dbus/dbus_thread_manager.h"
47 #include "chromeos/network/network_handler.h" 47 #include "chromeos/network/network_handler.h"
48 #include "chromeos/network/onc/onc_certificate_importer_impl.h" 48 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
49 #include "chromeos/settings/cros_settings_names.h" 49 #include "chromeos/settings/cros_settings_names.h"
50 #include "chromeos/settings/cros_settings_provider.h" 50 #include "chromeos/settings/cros_settings_provider.h"
51 #include "chromeos/settings/timezone_settings.h" 51 #include "chromeos/settings/timezone_settings.h"
52 #include "chromeos/system/statistics_provider.h"
52 #include "components/policy/core/common/cloud/cloud_policy_client.h" 53 #include "components/policy/core/common/cloud/cloud_policy_client.h"
53 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" 54 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
54 #include "components/policy/core/common/proxy_policy_provider.h" 55 #include "components/policy/core/common/proxy_policy_provider.h"
55 #include "components/policy/proto/device_management_backend.pb.h" 56 #include "components/policy/proto/device_management_backend.pb.h"
56 #include "components/prefs/pref_registry_simple.h" 57 #include "components/prefs/pref_registry_simple.h"
57 #include "content/public/browser/browser_thread.h" 58 #include "content/public/browser/browser_thread.h"
58 #include "google_apis/gaia/gaia_auth_util.h" 59 #include "google_apis/gaia/gaia_auth_util.h"
59 #include "net/url_request/url_request_context_getter.h" 60 #include "net/url_request/url_request_context_getter.h"
60 61
61 using content::BrowserThread; 62 using content::BrowserThread;
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 320 }
320 } 321 }
321 322
322 void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() { 323 void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() {
323 device_cloud_policy_initializer_ = 324 device_cloud_policy_initializer_ =
324 base::MakeUnique<DeviceCloudPolicyInitializer>( 325 base::MakeUnique<DeviceCloudPolicyInitializer>(
325 local_state_, device_management_service(), GetBackgroundTaskRunner(), 326 local_state_, device_management_service(), GetBackgroundTaskRunner(),
326 install_attributes_.get(), state_keys_broker_.get(), 327 install_attributes_.get(), state_keys_broker_.get(),
327 device_cloud_policy_manager_->device_store(), 328 device_cloud_policy_manager_->device_store(),
328 device_cloud_policy_manager_, 329 device_cloud_policy_manager_,
329 cryptohome::AsyncMethodCaller::GetInstance(), 330 cryptohome::AsyncMethodCaller::GetInstance(), CreateAttestationFlow(),
330 CreateAttestationFlow()); 331 chromeos::system::StatisticsProvider::GetInstance());
331 device_cloud_policy_initializer_->Init(); 332 device_cloud_policy_initializer_->Init();
332 } 333 }
333 334
334 std::unique_ptr<chromeos::attestation::AttestationFlow> 335 std::unique_ptr<chromeos::attestation::AttestationFlow>
335 BrowserPolicyConnectorChromeOS::CreateAttestationFlow() { 336 BrowserPolicyConnectorChromeOS::CreateAttestationFlow() {
336 return base::MakeUnique<chromeos::attestation::AttestationFlow>( 337 return base::MakeUnique<chromeos::attestation::AttestationFlow>(
337 cryptohome::AsyncMethodCaller::GetInstance(), 338 cryptohome::AsyncMethodCaller::GetInstance(),
338 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(), 339 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(),
339 base::MakeUnique<chromeos::attestation::AttestationCAClient>()); 340 base::MakeUnique<chromeos::attestation::AttestationCAClient>());
340 } 341 }
341 342
342 chromeos::AffiliationIDSet 343 chromeos::AffiliationIDSet
343 BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const { 344 BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const {
344 chromeos::AffiliationIDSet affiliation_ids; 345 chromeos::AffiliationIDSet affiliation_ids;
345 if (device_cloud_policy_manager_) { 346 if (device_cloud_policy_manager_) {
346 const enterprise_management::PolicyData* const policy_data = 347 const enterprise_management::PolicyData* const policy_data =
347 device_cloud_policy_manager_->device_store()->policy(); 348 device_cloud_policy_manager_->device_store()->policy();
348 if (policy_data) { 349 if (policy_data) {
349 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), 350 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
350 policy_data->device_affiliation_ids().end()); 351 policy_data->device_affiliation_ids().end());
351 } 352 }
352 } 353 }
353 return affiliation_ids; 354 return affiliation_ids;
354 } 355 }
355 356
356 } // namespace policy 357 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698