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

Side by Side Diff: components/policy/core/common/cloud/cloud_policy_client.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/policy/core/common/cloud/cloud_policy_client.h" 5 #include "components/policy/core/common/cloud/cloud_policy_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 policy_fetch_request_job_->GetRequest()->mutable_unregister_request(); 243 policy_fetch_request_job_->GetRequest()->mutable_unregister_request();
244 policy_fetch_request_job_->Start( 244 policy_fetch_request_job_->Start(
245 base::Bind(&CloudPolicyClient::OnUnregisterCompleted, 245 base::Bind(&CloudPolicyClient::OnUnregisterCompleted,
246 base::Unretained(this))); 246 base::Unretained(this)));
247 } 247 }
248 248
249 void CloudPolicyClient::UploadCertificate( 249 void CloudPolicyClient::UploadCertificate(
250 const std::string& certificate_data, 250 const std::string& certificate_data,
251 const CloudPolicyClient::StatusCallback& callback) { 251 const CloudPolicyClient::StatusCallback& callback) {
252 CHECK(is_registered()); 252 CHECK(is_registered());
253 scoped_ptr<DeviceManagementRequestJob> request_job( 253 std::unique_ptr<DeviceManagementRequestJob> request_job(
254 service_->CreateJob(DeviceManagementRequestJob::TYPE_UPLOAD_CERTIFICATE, 254 service_->CreateJob(DeviceManagementRequestJob::TYPE_UPLOAD_CERTIFICATE,
255 GetRequestContext())); 255 GetRequestContext()));
256 request_job->SetDMToken(dm_token_); 256 request_job->SetDMToken(dm_token_);
257 request_job->SetClientID(client_id_); 257 request_job->SetClientID(client_id_);
258 258
259 em::DeviceManagementRequest* request = request_job->GetRequest(); 259 em::DeviceManagementRequest* request = request_job->GetRequest();
260 request->mutable_cert_upload_request()->set_device_certificate( 260 request->mutable_cert_upload_request()->set_device_certificate(
261 certificate_data); 261 certificate_data);
262 262
263 const DeviceManagementRequestJob::Callback job_callback = 263 const DeviceManagementRequestJob::Callback job_callback =
264 base::Bind(&CloudPolicyClient::OnCertificateUploadCompleted, 264 base::Bind(&CloudPolicyClient::OnCertificateUploadCompleted,
265 base::Unretained(this), request_job.get(), callback); 265 base::Unretained(this), request_job.get(), callback);
266 266
267 request_jobs_.push_back(std::move(request_job)); 267 request_jobs_.push_back(std::move(request_job));
268 request_jobs_.back()->Start(job_callback); 268 request_jobs_.back()->Start(job_callback);
269 } 269 }
270 270
271 void CloudPolicyClient::UploadDeviceStatus( 271 void CloudPolicyClient::UploadDeviceStatus(
272 const em::DeviceStatusReportRequest* device_status, 272 const em::DeviceStatusReportRequest* device_status,
273 const em::SessionStatusReportRequest* session_status, 273 const em::SessionStatusReportRequest* session_status,
274 const CloudPolicyClient::StatusCallback& callback) { 274 const CloudPolicyClient::StatusCallback& callback) {
275 CHECK(is_registered()); 275 CHECK(is_registered());
276 // Should pass in at least one type of status. 276 // Should pass in at least one type of status.
277 DCHECK(device_status || session_status); 277 DCHECK(device_status || session_status);
278 scoped_ptr<DeviceManagementRequestJob> request_job( 278 std::unique_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob(
279 service_->CreateJob(DeviceManagementRequestJob::TYPE_UPLOAD_STATUS, 279 DeviceManagementRequestJob::TYPE_UPLOAD_STATUS, GetRequestContext()));
280 GetRequestContext()));
281 request_job->SetDMToken(dm_token_); 280 request_job->SetDMToken(dm_token_);
282 request_job->SetClientID(client_id_); 281 request_job->SetClientID(client_id_);
283 282
284 em::DeviceManagementRequest* request = request_job->GetRequest(); 283 em::DeviceManagementRequest* request = request_job->GetRequest();
285 if (device_status) 284 if (device_status)
286 *request->mutable_device_status_report_request() = *device_status; 285 *request->mutable_device_status_report_request() = *device_status;
287 if (session_status) 286 if (session_status)
288 *request->mutable_session_status_report_request() = *session_status; 287 *request->mutable_session_status_report_request() = *session_status;
289 288
290 const DeviceManagementRequestJob::Callback job_callback = 289 const DeviceManagementRequestJob::Callback job_callback =
291 base::Bind(&CloudPolicyClient::OnStatusUploadCompleted, 290 base::Bind(&CloudPolicyClient::OnStatusUploadCompleted,
292 base::Unretained(this), request_job.get(), callback); 291 base::Unretained(this), request_job.get(), callback);
293 292
294 request_jobs_.push_back(std::move(request_job)); 293 request_jobs_.push_back(std::move(request_job));
295 request_jobs_.back()->Start(job_callback); 294 request_jobs_.back()->Start(job_callback);
296 } 295 }
297 296
298 void CloudPolicyClient::FetchRemoteCommands( 297 void CloudPolicyClient::FetchRemoteCommands(
299 scoped_ptr<RemoteCommandJob::UniqueIDType> last_command_id, 298 std::unique_ptr<RemoteCommandJob::UniqueIDType> last_command_id,
300 const std::vector<em::RemoteCommandResult>& command_results, 299 const std::vector<em::RemoteCommandResult>& command_results,
301 const RemoteCommandCallback& callback) { 300 const RemoteCommandCallback& callback) {
302 CHECK(is_registered()); 301 CHECK(is_registered());
303 scoped_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob( 302 std::unique_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob(
304 DeviceManagementRequestJob::TYPE_REMOTE_COMMANDS, GetRequestContext())); 303 DeviceManagementRequestJob::TYPE_REMOTE_COMMANDS, GetRequestContext()));
305 304
306 request_job->SetDMToken(dm_token_); 305 request_job->SetDMToken(dm_token_);
307 request_job->SetClientID(client_id_); 306 request_job->SetClientID(client_id_);
308 307
309 em::DeviceRemoteCommandRequest* const request = 308 em::DeviceRemoteCommandRequest* const request =
310 request_job->GetRequest()->mutable_remote_command_request(); 309 request_job->GetRequest()->mutable_remote_command_request();
311 310
312 if (last_command_id) 311 if (last_command_id)
313 request->set_last_command_unique_id(*last_command_id); 312 request->set_last_command_unique_id(*last_command_id);
314 313
315 for (const auto& command_result : command_results) 314 for (const auto& command_result : command_results)
316 *request->add_command_results() = command_result; 315 *request->add_command_results() = command_result;
317 316
318 const DeviceManagementRequestJob::Callback job_callback = 317 const DeviceManagementRequestJob::Callback job_callback =
319 base::Bind(&CloudPolicyClient::OnRemoteCommandsFetched, 318 base::Bind(&CloudPolicyClient::OnRemoteCommandsFetched,
320 base::Unretained(this), request_job.get(), callback); 319 base::Unretained(this), request_job.get(), callback);
321 320
322 request_jobs_.push_back(std::move(request_job)); 321 request_jobs_.push_back(std::move(request_job));
323 request_jobs_.back()->Start(job_callback); 322 request_jobs_.back()->Start(job_callback);
324 } 323 }
325 324
326 void CloudPolicyClient::GetDeviceAttributeUpdatePermission( 325 void CloudPolicyClient::GetDeviceAttributeUpdatePermission(
327 const std::string &auth_token, 326 const std::string &auth_token,
328 const CloudPolicyClient::StatusCallback& callback) { 327 const CloudPolicyClient::StatusCallback& callback) {
329 CHECK(is_registered()); 328 CHECK(is_registered());
330 DCHECK(!auth_token.empty()); 329 DCHECK(!auth_token.empty());
331 330
332 scoped_ptr<DeviceManagementRequestJob> request_job( 331 std::unique_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob(
333 service_->CreateJob( 332 DeviceManagementRequestJob::TYPE_ATTRIBUTE_UPDATE_PERMISSION,
334 DeviceManagementRequestJob::TYPE_ATTRIBUTE_UPDATE_PERMISSION, 333 GetRequestContext()));
335 GetRequestContext()));
336 334
337 request_job->SetOAuthToken(auth_token); 335 request_job->SetOAuthToken(auth_token);
338 request_job->SetClientID(client_id_); 336 request_job->SetClientID(client_id_);
339 337
340 request_job->GetRequest()-> 338 request_job->GetRequest()->
341 mutable_device_attribute_update_permission_request(); 339 mutable_device_attribute_update_permission_request();
342 340
343 const DeviceManagementRequestJob::Callback job_callback = 341 const DeviceManagementRequestJob::Callback job_callback =
344 base::Bind(&CloudPolicyClient::OnDeviceAttributeUpdatePermissionCompleted, 342 base::Bind(&CloudPolicyClient::OnDeviceAttributeUpdatePermissionCompleted,
345 base::Unretained(this), request_job.get(), callback); 343 base::Unretained(this), request_job.get(), callback);
346 344
347 request_jobs_.push_back(std::move(request_job)); 345 request_jobs_.push_back(std::move(request_job));
348 request_jobs_.back()->Start(job_callback); 346 request_jobs_.back()->Start(job_callback);
349 } 347 }
350 348
351 void CloudPolicyClient::UpdateDeviceAttributes( 349 void CloudPolicyClient::UpdateDeviceAttributes(
352 const std::string& auth_token, 350 const std::string& auth_token,
353 const std::string& asset_id, 351 const std::string& asset_id,
354 const std::string& location, 352 const std::string& location,
355 const CloudPolicyClient::StatusCallback& callback) { 353 const CloudPolicyClient::StatusCallback& callback) {
356 CHECK(is_registered()); 354 CHECK(is_registered());
357 DCHECK(!auth_token.empty()); 355 DCHECK(!auth_token.empty());
358 356
359 scoped_ptr<DeviceManagementRequestJob> request_job( 357 std::unique_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob(
360 service_->CreateJob( 358 DeviceManagementRequestJob::TYPE_ATTRIBUTE_UPDATE, GetRequestContext()));
361 DeviceManagementRequestJob::TYPE_ATTRIBUTE_UPDATE,
362 GetRequestContext()));
363 359
364 request_job->SetOAuthToken(auth_token); 360 request_job->SetOAuthToken(auth_token);
365 request_job->SetClientID(client_id_); 361 request_job->SetClientID(client_id_);
366 362
367 em::DeviceAttributeUpdateRequest* request = 363 em::DeviceAttributeUpdateRequest* request =
368 request_job->GetRequest()->mutable_device_attribute_update_request(); 364 request_job->GetRequest()->mutable_device_attribute_update_request();
369 365
370 request->set_asset_id(asset_id); 366 request->set_asset_id(asset_id);
371 request->set_location(location); 367 request->set_location(location);
372 368
373 const DeviceManagementRequestJob::Callback job_callback = 369 const DeviceManagementRequestJob::Callback job_callback =
374 base::Bind(&CloudPolicyClient::OnDeviceAttributeUpdated, 370 base::Bind(&CloudPolicyClient::OnDeviceAttributeUpdated,
375 base::Unretained(this), request_job.get(), callback); 371 base::Unretained(this), request_job.get(), callback);
376 372
377 request_jobs_.push_back(std::move(request_job)); 373 request_jobs_.push_back(std::move(request_job));
378 request_jobs_.back()->Start(job_callback); 374 request_jobs_.back()->Start(job_callback);
379 } 375 }
380 376
381 void CloudPolicyClient::UpdateGcmId( 377 void CloudPolicyClient::UpdateGcmId(
382 const std::string& gcm_id, 378 const std::string& gcm_id,
383 const CloudPolicyClient::StatusCallback& callback) { 379 const CloudPolicyClient::StatusCallback& callback) {
384 CHECK(is_registered()); 380 CHECK(is_registered());
385 381
386 scoped_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob( 382 std::unique_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob(
387 DeviceManagementRequestJob::TYPE_GCM_ID_UPDATE, GetRequestContext())); 383 DeviceManagementRequestJob::TYPE_GCM_ID_UPDATE, GetRequestContext()));
388 384
389 request_job->SetDMToken(dm_token_); 385 request_job->SetDMToken(dm_token_);
390 request_job->SetClientID(client_id_); 386 request_job->SetClientID(client_id_);
391 387
392 em::GcmIdUpdateRequest* const request = 388 em::GcmIdUpdateRequest* const request =
393 request_job->GetRequest()->mutable_gcm_id_update_request(); 389 request_job->GetRequest()->mutable_gcm_id_update_request();
394 390
395 request->set_gcm_id(gcm_id); 391 request->set_gcm_id(gcm_id);
396 392
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 710
715 void CloudPolicyClient::NotifyRobotAuthCodesFetched() { 711 void CloudPolicyClient::NotifyRobotAuthCodesFetched() {
716 FOR_EACH_OBSERVER(Observer, observers_, OnRobotAuthCodesFetched(this)); 712 FOR_EACH_OBSERVER(Observer, observers_, OnRobotAuthCodesFetched(this));
717 } 713 }
718 714
719 void CloudPolicyClient::NotifyClientError() { 715 void CloudPolicyClient::NotifyClientError() {
720 FOR_EACH_OBSERVER(Observer, observers_, OnClientError(this)); 716 FOR_EACH_OBSERVER(Observer, observers_, OnClientError(this));
721 } 717 }
722 718
723 } // namespace policy 719 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698