summaryrefslogtreecommitdiff
path: root/chromium/net/http/transport_security_persister_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-18 14:10:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-18 13:53:24 +0000
commit813fbf95af77a531c57a8c497345ad2c61d475b3 (patch)
tree821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/net/http/transport_security_persister_unittest.cc
parentaf6588f8d723931a298c995fa97259bb7f7deb55 (diff)
downloadqtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/http/transport_security_persister_unittest.cc')
-rw-r--r--chromium/net/http/transport_security_persister_unittest.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/chromium/net/http/transport_security_persister_unittest.cc b/chromium/net/http/transport_security_persister_unittest.cc
index 7bb2e995833..1d547eacf11 100644
--- a/chromium/net/http/transport_security_persister_unittest.cc
+++ b/chromium/net/http/transport_security_persister_unittest.cc
@@ -15,8 +15,9 @@
#include "net/http/transport_security_state.h"
#include "testing/gtest/include/gtest/gtest.h"
-using net::TransportSecurityPersister;
-using net::TransportSecurityState;
+namespace net {
+
+namespace {
class TransportSecurityPersisterTest : public testing::Test {
public:
@@ -86,13 +87,13 @@ TEST_F(TransportSecurityPersisterTest, SerializeData2) {
TEST_F(TransportSecurityPersisterTest, SerializeData3) {
// Add an entry.
- net::HashValue fp1(net::HASH_VALUE_SHA1);
+ HashValue fp1(HASH_VALUE_SHA1);
memset(fp1.data(), 0, fp1.size());
- net::HashValue fp2(net::HASH_VALUE_SHA1);
+ HashValue fp2(HASH_VALUE_SHA1);
memset(fp2.data(), 1, fp2.size());
base::Time expiry =
base::Time::Now() + base::TimeDelta::FromSeconds(1000);
- net::HashValueVector dynamic_spki_hashes;
+ HashValueVector dynamic_spki_hashes;
dynamic_spki_hashes.push_back(fp1);
dynamic_spki_hashes.push_back(fp2);
bool include_subdomains = false;
@@ -168,11 +169,11 @@ TEST_F(TransportSecurityPersisterTest, PublicKeyHashes) {
TransportSecurityState::DomainState domain_state;
static const char kTestDomain[] = "example.com";
EXPECT_FALSE(state_.GetDynamicDomainState(kTestDomain, &domain_state));
- net::HashValueVector hashes;
+ HashValueVector hashes;
std::string failure_log;
EXPECT_FALSE(domain_state.CheckPublicKeyPins(hashes, &failure_log));
- net::HashValue sha1(net::HASH_VALUE_SHA1);
+ HashValue sha1(HASH_VALUE_SHA1);
memset(sha1.data(), '1', sha1.size());
domain_state.pkp.spki_hashes.push_back(sha1);
@@ -204,3 +205,7 @@ TEST_F(TransportSecurityPersisterTest, PublicKeyHashes) {
sha1.data(),
sha1.size()));
}
+
+} // namespace
+
+} // namespace net