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

Unified Diff: chrome/browser/chromeos/policy/status_uploader_unittest.cc

Issue 1557693002: Convert Pass()→std::move() in //chrome/browser/chromeos/policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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: chrome/browser/chromeos/policy/status_uploader_unittest.cc
diff --git a/chrome/browser/chromeos/policy/status_uploader_unittest.cc b/chrome/browser/chromeos/policy/status_uploader_unittest.cc
index e71691452b69085ee3075b98cb864457edec19cb..74a2286daaeca41d5c0c0254314efddb4f8c1e8e 100644
--- a/chrome/browser/chromeos/policy/status_uploader_unittest.cc
+++ b/chrome/browser/chromeos/policy/status_uploader_unittest.cc
@@ -2,12 +2,15 @@
// 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/status_uploader.h"
+
+#include <utility>
+
#include "base/prefs/testing_pref_service.h"
#include "base/test/test_simple_task_runner.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
#include "chrome/browser/chromeos/policy/device_status_collector.h"
-#include "chrome/browser/chromeos/policy/status_uploader.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
@@ -136,7 +139,7 @@ class StatusUploaderTest : public testing::Test {
TEST_F(StatusUploaderTest, BasicTest) {
EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
- StatusUploader uploader(&client_, collector_.Pass(), task_runner_);
+ StatusUploader uploader(&client_, std::move(collector_), task_runner_);
EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());
// On startup, first update should happen immediately.
EXPECT_EQ(base::TimeDelta(), task_runner_->NextPendingTaskDelay());
@@ -151,7 +154,7 @@ TEST_F(StatusUploaderTest, DifferentFrequencyAtStart) {
const base::TimeDelta expected_delay = base::TimeDelta::FromMilliseconds(
new_delay);
EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
- StatusUploader uploader(&client_, collector_.Pass(), task_runner_);
+ StatusUploader uploader(&client_, std::move(collector_), task_runner_);
ASSERT_EQ(1U, task_runner_->GetPendingTasks().size());
// On startup, first update should happen immediately.
EXPECT_EQ(base::TimeDelta(), task_runner_->NextPendingTaskDelay());
@@ -167,7 +170,7 @@ TEST_F(StatusUploaderTest, ResetTimerAfterStatusCollection) {
// Keep a pointer to the mock collector because collector_ gets cleared
// when it is passed to the StatusUploader constructor below.
MockDeviceStatusCollector* const mock_collector = collector_.get();
- StatusUploader uploader(&client_, collector_.Pass(), task_runner_);
+ StatusUploader uploader(&client_, std::move(collector_), task_runner_);
EXPECT_CALL(*mock_collector, GetDeviceStatus(_)).WillRepeatedly(Return(true));
EXPECT_CALL(*mock_collector, GetDeviceSessionStatus(_)).WillRepeatedly(
Return(true));
@@ -187,7 +190,7 @@ TEST_F(StatusUploaderTest, ResetTimerAfterFailedStatusCollection) {
// Keep a pointer to the mock collector because collector_ gets cleared
// when it is passed to the StatusUploader constructor below.
MockDeviceStatusCollector* mock_collector = collector_.get();
- StatusUploader uploader(&client_, collector_.Pass(), task_runner_);
+ StatusUploader uploader(&client_, std::move(collector_), task_runner_);
EXPECT_CALL(*mock_collector, GetDeviceStatus(_)).WillOnce(Return(false));
EXPECT_CALL(*mock_collector, GetDeviceSessionStatus(_)).WillOnce(
Return(false));
@@ -204,7 +207,7 @@ TEST_F(StatusUploaderTest, ChangeFrequency) {
// Keep a pointer to the mock collector because collector_ gets cleared
// when it is passed to the StatusUploader constructor below.
MockDeviceStatusCollector* const mock_collector = collector_.get();
- StatusUploader uploader(&client_, collector_.Pass(), task_runner_);
+ StatusUploader uploader(&client_, std::move(collector_), task_runner_);
EXPECT_CALL(*mock_collector, GetDeviceStatus(_)).WillRepeatedly(Return(true));
EXPECT_CALL(*mock_collector, GetDeviceSessionStatus(_)).WillRepeatedly(
Return(true));
@@ -219,7 +222,7 @@ TEST_F(StatusUploaderTest, ChangeFrequency) {
#if defined(USE_X11) || defined(USE_OZONE)
TEST_F(StatusUploaderTest, NoUploadAfterUserInput) {
- StatusUploader uploader(&client_, collector_.Pass(), task_runner_);
+ StatusUploader uploader(&client_, std::move(collector_), task_runner_);
// Should allow data upload before there is user input.
EXPECT_TRUE(uploader.IsSessionDataUploadAllowed());
@@ -244,7 +247,7 @@ TEST_F(StatusUploaderTest, NoUploadAfterUserInput) {
#endif
TEST_F(StatusUploaderTest, NoUploadAfterVideoCapture) {
- StatusUploader uploader(&client_, collector_.Pass(), task_runner_);
+ StatusUploader uploader(&client_, std::move(collector_), task_runner_);
// Should allow data upload before there is video capture.
EXPECT_TRUE(uploader.IsSessionDataUploadAllowed());
« no previous file with comments | « chrome/browser/chromeos/policy/status_uploader.cc ('k') | chrome/browser/chromeos/policy/system_log_uploader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698