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

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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 | Annotate | Revision Log
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/process/kill.h" 9 #include "base/process/kill.h"
10 #include "base/process/launch.h" 10 #include "base/process/launch.h"
11 #include "chrome/browser/media/test_license_server_config.h" 11 #include "chrome/browser/media/test_license_server_config.h"
12 12
13 13
14 TestLicenseServer::TestLicenseServer( 14 TestLicenseServer::TestLicenseServer(
15 scoped_ptr<TestLicenseServerConfig> server_config) 15 scoped_ptr<TestLicenseServerConfig> server_config)
16 : server_config_(server_config.Pass()), 16 : server_config_(server_config.Pass()),
17 license_server_process_(base::kNullProcessHandle) { 17 license_server_process_(base::kNullProcessHandle) {
18 } 18 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 license_server_process_ = base::kNullProcessHandle; 58 license_server_process_ = base::kNullProcessHandle;
59 } else { 59 } else {
60 VLOG(1) << "Kill failed?!"; 60 VLOG(1) << "Kill failed?!";
61 } 61 }
62 return kill_succeeded; 62 return kill_succeeded;
63 } 63 }
64 64
65 std::string TestLicenseServer::GetServerURL() { 65 std::string TestLicenseServer::GetServerURL() {
66 return server_config_->GetServerURL(); 66 return server_config_->GetServerURL();
67 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc ('k') | chrome/browser/media/webrtc_browsertest_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698