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

Side by Side Diff: net/base/test_data_directory.cc

Issue 12220104: Wire up SSL client authentication for OpenSSL/Android through the net/ stack (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: address nits Created 7 years, 9 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 "net/base/test_data_directory.h" 5 #include "net/base/test_data_directory.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 9
10 namespace net { 10 namespace net {
11 11
12 namespace { 12 namespace {
13 const base::FilePath::CharType kCertificateRelativePath[] = 13 const base::FilePath::CharType kCertificateRelativePath[] =
14 FILE_PATH_LITERAL("net/data/ssl/certificates"); 14 FILE_PATH_LITERAL("net/data/ssl/certificates");
15 } // namespace 15 } // namespace
16 16
17 base::FilePath GetTestCertsDirectory() { 17 base::FilePath GetTestCertsDirectory() {
18 base::FilePath src_root; 18 base::FilePath src_root;
19 PathService::Get(base::DIR_SOURCE_ROOT, &src_root); 19 PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
20 return src_root.Append(kCertificateRelativePath); 20 return src_root.Append(kCertificateRelativePath);
21 } 21 }
22 22
23 base::FilePath GetTestCertsDirectoryRelative() { 23 base::FilePath GetTestClientCertsDirectory() {
24 #if defined(OS_ANDROID)
24 return base::FilePath(kCertificateRelativePath); 25 return base::FilePath(kCertificateRelativePath);
26 #else
27 return GetTestCertsDirectory();
28 #endif
25 } 29 }
26 30
27 base::FilePath GetWebSocketTestDataDirectory() { 31 base::FilePath GetWebSocketTestDataDirectory() {
28 base::FilePath data_dir(FILE_PATH_LITERAL("net/data/websocket")); 32 base::FilePath data_dir(FILE_PATH_LITERAL("net/data/websocket"));
29 return data_dir; 33 return data_dir;
30 } 34 }
31 35
32 } // namespace net 36 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698