Chromium Code Reviews| Index: chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.cc |
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.cc |
| similarity index 57% |
| rename from chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc |
| rename to chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.cc |
| index e41442e055e29e8164f435da5d62b53b6971466f..6e0931d0095739875eac975317aff1952ecb9958 100644 |
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc |
| +++ b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.cc |
| @@ -2,34 +2,34 @@ |
| // 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_invalidator.h" |
| +#include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h" |
| #include "base/logging.h" |
| -#include "base/message_loop/message_loop_proxy.h" |
| +#include "base/thread_task_runner_handle.h" |
| #include "base/time/clock.h" |
| #include "base/time/default_clock.h" |
| -#include "chrome/browser/browser_process.h" |
| -#include "chrome/browser/browser_process_platform_part_chromeos.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/policy/cloud/cloud_policy_invalidator.h" |
| #include "policy/proto/device_management_backend.pb.h" |
|
pneubeck (no reviews)
2015/02/04 10:02:13
nit: included in .h already
bartfab (slow)
2015/02/04 12:34:51
Done.
|
| namespace policy { |
| -DeviceCloudPolicyInvalidator::DeviceCloudPolicyInvalidator( |
| +AffiliatedCloudPolicyInvalidator::AffiliatedCloudPolicyInvalidator( |
| + enterprise_management::DeviceRegisterRequest::Type type, |
| + CloudPolicyCore* core, |
| AffiliatedInvalidationServiceProvider* invalidation_service_provider) |
| - : invalidation_service_provider_(invalidation_service_provider), |
| + : type_(type), |
| + core_(core), |
| + invalidation_service_provider_(invalidation_service_provider), |
| highest_handled_invalidation_version_(0) { |
| invalidation_service_provider_->RegisterConsumer(this); |
| } |
| -DeviceCloudPolicyInvalidator::~DeviceCloudPolicyInvalidator() { |
| +AffiliatedCloudPolicyInvalidator::~AffiliatedCloudPolicyInvalidator() { |
| DestroyInvalidator(); |
| invalidation_service_provider_->UnregisterConsumer(this); |
| } |
| -void DeviceCloudPolicyInvalidator::OnInvalidationServiceSet( |
| +void AffiliatedCloudPolicyInvalidator::OnInvalidationServiceSet( |
| invalidation::InvalidationService* invalidation_service) { |
| DestroyInvalidator(); |
| if (invalidation_service) |
| @@ -37,24 +37,23 @@ void DeviceCloudPolicyInvalidator::OnInvalidationServiceSet( |
| } |
| CloudPolicyInvalidator* |
| -DeviceCloudPolicyInvalidator::GetInvalidatorForTest() const { |
| +AffiliatedCloudPolicyInvalidator::GetInvalidatorForTest() const { |
| return invalidator_.get(); |
| } |
| -void DeviceCloudPolicyInvalidator::CreateInvalidator( |
| +void AffiliatedCloudPolicyInvalidator::CreateInvalidator( |
| invalidation::InvalidationService* invalidation_service) { |
| DCHECK(!invalidator_); |
| invalidator_.reset(new CloudPolicyInvalidator( |
| - enterprise_management::DeviceRegisterRequest::DEVICE, |
| - g_browser_process->platform_part()->browser_policy_connector_chromeos()-> |
| - GetDeviceCloudPolicyManager()->core(), |
| - base::MessageLoopProxy::current(), |
| + type_, |
| + core_, |
| + base::ThreadTaskRunnerHandle::Get(), |
| scoped_ptr<base::Clock>(new base::DefaultClock()), |
| highest_handled_invalidation_version_)); |
| invalidator_->Initialize(invalidation_service); |
| } |
| -void DeviceCloudPolicyInvalidator::DestroyInvalidator() { |
| +void AffiliatedCloudPolicyInvalidator::DestroyInvalidator() { |
| if (!invalidator_) |
| return; |