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

Side by Side Diff: chrome/browser/media/test_license_server.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/media/test_license_server.h" 5 #include "chrome/browser/media/test_license_server.h"
6 6
7 #include <utility>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
9 #include "base/process/launch.h" 11 #include "base/process/launch.h"
10 #include "chrome/browser/media/test_license_server_config.h" 12 #include "chrome/browser/media/test_license_server_config.h"
11 13
12
13 TestLicenseServer::TestLicenseServer( 14 TestLicenseServer::TestLicenseServer(
14 scoped_ptr<TestLicenseServerConfig> server_config) 15 scoped_ptr<TestLicenseServerConfig> server_config)
15 : server_config_(server_config.Pass()) { 16 : server_config_(std::move(server_config)) {}
16 }
17 17
18 TestLicenseServer::~TestLicenseServer() { 18 TestLicenseServer::~TestLicenseServer() {
19 Stop(); 19 Stop();
20 } 20 }
21 21
22 bool TestLicenseServer::Start() { 22 bool TestLicenseServer::Start() {
23 if (license_server_process_.IsValid()) 23 if (license_server_process_.IsValid())
24 return true; 24 return true;
25 25
26 if (!server_config_->IsPlatformSupported()) { 26 if (!server_config_->IsPlatformSupported()) {
(...skipping 28 matching lines...) Expand all
55 license_server_process_.Close(); 55 license_server_process_.Close();
56 } else { 56 } else {
57 DVLOG(1) << "Kill failed?!"; 57 DVLOG(1) << "Kill failed?!";
58 } 58 }
59 return kill_succeeded; 59 return kill_succeeded;
60 } 60 }
61 61
62 std::string TestLicenseServer::GetServerURL() { 62 std::string TestLicenseServer::GetServerURL() {
63 return server_config_->GetServerURL(); 63 return server_config_->GetServerURL();
64 } 64 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698