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

Side by Side Diff: chrome/browser/chromeos/policy/consumer_unenrollment_handler_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 4 years, 11 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/consumer_unenrollment_handler.h" 5 #include "chrome/browser/chromeos/policy/consumer_unenrollment_handler.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
9 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
10 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
11 #include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h" 13 #include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"
12 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 14 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
13 #include "chrome/browser/chromeos/policy/consumer_management_stage.h" 15 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
14 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 16 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
15 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 17 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
16 #include "chrome/browser/chromeos/policy/fake_consumer_management_service.h" 18 #include "chrome/browser/chromeos/policy/fake_consumer_management_service.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 FlushDeviceSettings(); 51 FlushDeviceSettings();
50 52
51 53
52 // Set up FakeDeviceCloudPolicyManager. 54 // Set up FakeDeviceCloudPolicyManager.
53 scoped_ptr<DeviceCloudPolicyStoreChromeOS> store_( 55 scoped_ptr<DeviceCloudPolicyStoreChromeOS> store_(
54 new DeviceCloudPolicyStoreChromeOS( 56 new DeviceCloudPolicyStoreChromeOS(
55 &device_settings_service_, 57 &device_settings_service_,
56 install_attributes_.get(), 58 install_attributes_.get(),
57 base::ThreadTaskRunnerHandle::Get())); 59 base::ThreadTaskRunnerHandle::Get()));
58 fake_manager_.reset(new FakeDeviceCloudPolicyManager( 60 fake_manager_.reset(new FakeDeviceCloudPolicyManager(
59 store_.Pass(), 61 std::move(store_), base::ThreadTaskRunnerHandle::Get()));
60 base::ThreadTaskRunnerHandle::Get()));
61 62
62 // Set up FakeOwnerSettingsService. 63 // Set up FakeOwnerSettingsService.
63 fake_owner_settings_service_.reset(new chromeos::FakeOwnerSettingsService( 64 fake_owner_settings_service_.reset(new chromeos::FakeOwnerSettingsService(
64 profile_.get(), owner_key_util_, nullptr)); 65 profile_.get(), owner_key_util_, nullptr));
65 chromeos::OwnerSettingsServiceChromeOS::ManagementSettings settings; 66 chromeos::OwnerSettingsServiceChromeOS::ManagementSettings settings;
66 settings.management_mode = policy::MANAGEMENT_MODE_CONSUMER_MANAGED; 67 settings.management_mode = policy::MANAGEMENT_MODE_CONSUMER_MANAGED;
67 settings.request_token = "fake_request_token"; 68 settings.request_token = "fake_request_token";
68 settings.device_id = "fake_device_id"; 69 settings.device_id = "fake_device_id";
69 fake_owner_settings_service_->SetManagementSettings( 70 fake_owner_settings_service_->SetManagementSettings(
70 settings, 71 settings,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 EXPECT_EQ(ConsumerManagementStage::UnenrollmentDMServerFailed(), 120 EXPECT_EQ(ConsumerManagementStage::UnenrollmentDMServerFailed(),
120 fake_service_->GetStage()); 121 fake_service_->GetStage());
121 const chromeos::OwnerSettingsServiceChromeOS::ManagementSettings& settings = 122 const chromeos::OwnerSettingsServiceChromeOS::ManagementSettings& settings =
122 fake_owner_settings_service_->last_settings(); 123 fake_owner_settings_service_->last_settings();
123 EXPECT_EQ(policy::MANAGEMENT_MODE_CONSUMER_MANAGED, settings.management_mode); 124 EXPECT_EQ(policy::MANAGEMENT_MODE_CONSUMER_MANAGED, settings.management_mode);
124 EXPECT_EQ("fake_request_token", settings.request_token); 125 EXPECT_EQ("fake_request_token", settings.request_token);
125 EXPECT_EQ("fake_device_id", settings.device_id); 126 EXPECT_EQ("fake_device_id", settings.device_id);
126 } 127 }
127 128
128 } // namespace policy 129 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698