diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:23:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:23:50 +0000 |
| commit | 82f84b91a10f513cd59b8382a7ab00ed0f179bd5 (patch) | |
| tree | 125081aff715fbe6815e8bb81889d4d49f887cf3 /remoting/protocol | |
| parent | 88a8115978d75161674d97cde0761cbdba73daed (diff) | |
| download | chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.zip chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.tar.gz chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.tar.bz2 | |
Move ReadFileToString to the base namespace.
BUG=
Review URL: https://codereview.chromium.org/19579005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/authenticator_test_base.cc | 4 | ||||
| -rw-r--r-- | remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc index 22b1047..8311476 100644 --- a/remoting/protocol/authenticator_test_base.cc +++ b/remoting/protocol/authenticator_test_base.cc @@ -47,11 +47,11 @@ void AuthenticatorTestBase::SetUp() { base::FilePath certs_dir(net::GetTestCertsDirectory()); base::FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der"); - ASSERT_TRUE(file_util::ReadFileToString(cert_path, &host_cert_)); + ASSERT_TRUE(base::ReadFileToString(cert_path, &host_cert_)); base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin"); std::string key_string; - ASSERT_TRUE(file_util::ReadFileToString(key_path, &key_string)); + ASSERT_TRUE(base::ReadFileToString(key_path, &key_string)); std::string key_base64; ASSERT_TRUE(base::Base64Encode(key_string, &key_base64)); key_pair_ = RsaKeyPair::FromString(key_base64); diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc index f93658d..abf2880 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc @@ -58,11 +58,11 @@ class SslHmacChannelAuthenticatorTest : public testing::Test { base::FilePath certs_dir(net::GetTestCertsDirectory()); base::FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der"); - ASSERT_TRUE(file_util::ReadFileToString(cert_path, &host_cert_)); + ASSERT_TRUE(base::ReadFileToString(cert_path, &host_cert_)); base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin"); std::string key_string; - ASSERT_TRUE(file_util::ReadFileToString(key_path, &key_string)); + ASSERT_TRUE(base::ReadFileToString(key_path, &key_string)); std::string key_base64; base::Base64Encode(key_string, &key_base64); key_pair_ = RsaKeyPair::FromString(key_base64); |