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

Unified Diff: components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc

Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and use namespace alias Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
index 6f39eb62745d04684796c37a00ba6983f8ded753..52b45fd210195f2ace4751a86078557a38078d91 100644
--- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
@@ -2,17 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
+
#include <stdint.h>
+#include <memory>
+
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/test/test_simple_task_runner.h"
#include "build/build_config.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
-#include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
#include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
#include "components/policy/core/common/cloud/mock_cloud_policy_store.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -142,7 +144,7 @@ class CloudPolicyRefreshSchedulerTest : public testing::Test {
MockCloudPolicyClient client_;
MockCloudPolicyStore store_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
- scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
+ std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
// Base time for the refresh that the scheduler should be using.
base::Time last_update_;
@@ -150,7 +152,8 @@ class CloudPolicyRefreshSchedulerTest : public testing::Test {
TEST_F(CloudPolicyRefreshSchedulerTest, InitialRefreshNoPolicy) {
store_.policy_.reset();
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(CreateRefreshScheduler());
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
+ CreateRefreshScheduler());
EXPECT_FALSE(task_runner_->GetPendingTasks().empty());
EXPECT_EQ(GetLastDelay(), base::TimeDelta());
EXPECT_CALL(client_, FetchPolicy()).Times(1);
@@ -159,14 +162,16 @@ TEST_F(CloudPolicyRefreshSchedulerTest, InitialRefreshNoPolicy) {
TEST_F(CloudPolicyRefreshSchedulerTest, InitialRefreshUnmanaged) {
store_.policy_->set_state(em::PolicyData::UNMANAGED);
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(CreateRefreshScheduler());
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
+ CreateRefreshScheduler());
CheckTiming(CloudPolicyRefreshScheduler::kUnmanagedRefreshDelayMs);
EXPECT_CALL(client_, FetchPolicy()).Times(1);
task_runner_->RunUntilIdle();
}
TEST_F(CloudPolicyRefreshSchedulerTest, InitialRefreshManagedNotYetFetched) {
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(CreateRefreshScheduler());
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
+ CreateRefreshScheduler());
EXPECT_FALSE(task_runner_->GetPendingTasks().empty());
CheckInitialRefresh(false);
EXPECT_CALL(client_, FetchPolicy()).Times(1);
@@ -177,7 +182,8 @@ TEST_F(CloudPolicyRefreshSchedulerTest, InitialRefreshManagedAlreadyFetched) {
last_update_ = base::Time::NowFromSystemTime();
client_.SetPolicy(dm_protocol::kChromeUserPolicyType, std::string(),
em::PolicyFetchResponse());
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(CreateRefreshScheduler());
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
+ CreateRefreshScheduler());
CheckTiming(kPolicyRefreshRate);
EXPECT_CALL(client_, FetchPolicy()).Times(1);
task_runner_->RunUntilIdle();
@@ -185,7 +191,8 @@ TEST_F(CloudPolicyRefreshSchedulerTest, InitialRefreshManagedAlreadyFetched) {
TEST_F(CloudPolicyRefreshSchedulerTest, Unregistered) {
client_.SetDMToken(std::string());
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(CreateRefreshScheduler());
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
+ CreateRefreshScheduler());
client_.NotifyPolicyFetched();
client_.NotifyRegistrationStateChanged();
client_.NotifyClientError();
@@ -196,7 +203,8 @@ TEST_F(CloudPolicyRefreshSchedulerTest, Unregistered) {
}
TEST_F(CloudPolicyRefreshSchedulerTest, RefreshSoon) {
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(CreateRefreshScheduler());
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
+ CreateRefreshScheduler());
EXPECT_CALL(client_, FetchPolicy()).Times(1);
scheduler->RefreshSoon();
task_runner_->RunUntilIdle();
@@ -204,7 +212,7 @@ TEST_F(CloudPolicyRefreshSchedulerTest, RefreshSoon) {
}
TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsAvailable) {
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
new CloudPolicyRefreshScheduler(&client_, &store_, task_runner_));
scheduler->SetRefreshDelay(kPolicyRefreshRate);
@@ -231,7 +239,7 @@ TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsAvailable) {
}
TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsNotAvailable) {
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
new CloudPolicyRefreshScheduler(&client_, &store_, task_runner_));
scheduler->SetRefreshDelay(kPolicyRefreshRate);
@@ -260,7 +268,7 @@ TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsNotAvailable) {
}
TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsOffAndOn) {
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
new CloudPolicyRefreshScheduler(&client_, &store_, task_runner_));
scheduler->SetRefreshDelay(kPolicyRefreshRate);
scheduler->SetInvalidationServiceAvailability(true);
@@ -287,7 +295,7 @@ TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsOffAndOn) {
}
TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsDisconnected) {
- scoped_ptr<CloudPolicyRefreshScheduler> scheduler(
+ std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
new CloudPolicyRefreshScheduler(&client_, &store_, task_runner_));
scheduler->SetRefreshDelay(kPolicyRefreshRate);
scheduler->SetInvalidationServiceAvailability(true);
@@ -325,7 +333,7 @@ class CloudPolicyRefreshSchedulerSteadyStateTest
CheckTiming(kPolicyRefreshRate);
}
- scoped_ptr<CloudPolicyRefreshScheduler> refresh_scheduler_;
+ std::unique_ptr<CloudPolicyRefreshScheduler> refresh_scheduler_;
};
TEST_F(CloudPolicyRefreshSchedulerSteadyStateTest, OnPolicyFetched) {

Powered by Google App Engine
This is Rietveld 408576698