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

Side by Side Diff: chrome/browser/media/wv_test_license_server_config.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/wv_test_license_server_config.h" 5 #include "chrome/browser/media/wv_test_license_server_config.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/rand_util.h" 11 #include "base/rand_util.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/socket/tcp_server_socket.h" 14 #include "net/socket/tcp_server_socket.h"
15 #include "net/test/python_utils.h" 15 #include "net/test/python_utils.h"
16 16
17 17
18 const uint16 kMinPort = 17000; 18 const uint16 kMinPort = 17000;
19 const uint16 kPortRangeSize = 1000; 19 const uint16 kPortRangeSize = 1000;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 void WVTestLicenseServerConfig::GetLicenseServerRootPath( 147 void WVTestLicenseServerConfig::GetLicenseServerRootPath(
148 base::FilePath* path) { 148 base::FilePath* path) {
149 base::FilePath source_root; 149 base::FilePath source_root;
150 PathService::Get(base::DIR_SOURCE_ROOT, &source_root); 150 PathService::Get(base::DIR_SOURCE_ROOT, &source_root);
151 *path = source_root.Append(FILE_PATH_LITERAL("third_party")) 151 *path = source_root.Append(FILE_PATH_LITERAL("third_party"))
152 .Append(FILE_PATH_LITERAL("widevine")) 152 .Append(FILE_PATH_LITERAL("widevine"))
153 .Append(FILE_PATH_LITERAL("test")) 153 .Append(FILE_PATH_LITERAL("test"))
154 .Append(FILE_PATH_LITERAL("license_server")); 154 .Append(FILE_PATH_LITERAL("license_server"));
155 } 155 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698