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

Side by Side Diff: remoting/protocol/authenticator_test_base.cc

Issue 12286020: Replace FilePath with base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 (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 "remoting/protocol/authenticator_test_base.h" 5 #include "remoting/protocol/authenticator_test_base.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 25 matching lines...) Expand all
36 36
37 AuthenticatorTestBase::MockChannelDoneCallback::MockChannelDoneCallback() {} 37 AuthenticatorTestBase::MockChannelDoneCallback::MockChannelDoneCallback() {}
38 38
39 AuthenticatorTestBase::MockChannelDoneCallback::~MockChannelDoneCallback() {} 39 AuthenticatorTestBase::MockChannelDoneCallback::~MockChannelDoneCallback() {}
40 40
41 AuthenticatorTestBase::AuthenticatorTestBase() {} 41 AuthenticatorTestBase::AuthenticatorTestBase() {}
42 42
43 AuthenticatorTestBase::~AuthenticatorTestBase() {} 43 AuthenticatorTestBase::~AuthenticatorTestBase() {}
44 44
45 void AuthenticatorTestBase::SetUp() { 45 void AuthenticatorTestBase::SetUp() {
46 FilePath certs_dir(net::GetTestCertsDirectory()); 46 base::FilePath certs_dir(net::GetTestCertsDirectory());
47 47
48 FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der"); 48 base::FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der");
49 ASSERT_TRUE(file_util::ReadFileToString(cert_path, &host_cert_)); 49 ASSERT_TRUE(file_util::ReadFileToString(cert_path, &host_cert_));
50 50
51 FilePath key_path = certs_dir.AppendASCII("unittest.key.bin"); 51 base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin");
52 std::string key_string; 52 std::string key_string;
53 ASSERT_TRUE(file_util::ReadFileToString(key_path, &key_string)); 53 ASSERT_TRUE(file_util::ReadFileToString(key_path, &key_string));
54 std::vector<uint8> key_vector( 54 std::vector<uint8> key_vector(
55 reinterpret_cast<const uint8*>(key_string.data()), 55 reinterpret_cast<const uint8*>(key_string.data()),
56 reinterpret_cast<const uint8*>(key_string.data() + 56 reinterpret_cast<const uint8*>(key_string.data() +
57 key_string.length())); 57 key_string.length()));
58 private_key_.reset( 58 private_key_.reset(
59 crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector)); 59 crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector));
60 } 60 }
61 61
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 void AuthenticatorTestBase::OnClientConnected( 148 void AuthenticatorTestBase::OnClientConnected(
149 net::Error error, 149 net::Error error,
150 scoped_ptr<net::StreamSocket> socket) { 150 scoped_ptr<net::StreamSocket> socket) {
151 client_callback_.OnDone(error); 151 client_callback_.OnDone(error);
152 client_socket_ = socket.Pass(); 152 client_socket_ = socket.Pass();
153 } 153 }
154 154
155 } // namespace protocol 155 } // namespace protocol
156 } // namespace remoting 156 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/base/resources.cc ('k') | remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698