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

Side by Side Diff: chrome/browser/net/transport_security_persister_unittest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 "chrome/browser/net/transport_security_persister.h" 5 #include "chrome/browser/net/transport_security_persister.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/files/scoped_temp_dir.h" 13 #include "base/files/scoped_temp_dir.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "content/public/test/test_browser_thread.h" 15 #include "content/public/test/test_browser_thread.h"
16 #include "net/http/transport_security_state.h" 16 #include "net/http/transport_security_state.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 using net::TransportSecurityState; 19 using net::TransportSecurityState;
20 20
21 class TransportSecurityPersisterTest : public testing::Test { 21 class TransportSecurityPersisterTest : public testing::Test {
22 public: 22 public:
23 TransportSecurityPersisterTest() 23 TransportSecurityPersisterTest()
24 : message_loop_(MessageLoop::TYPE_IO), 24 : message_loop_(base::MessageLoop::TYPE_IO),
25 test_file_thread_(content::BrowserThread::FILE, &message_loop_), 25 test_file_thread_(content::BrowserThread::FILE, &message_loop_),
26 test_io_thread_(content::BrowserThread::IO, &message_loop_) { 26 test_io_thread_(content::BrowserThread::IO, &message_loop_) {}
27 }
28 27
29 virtual ~TransportSecurityPersisterTest() { 28 virtual ~TransportSecurityPersisterTest() {
30 message_loop_.RunUntilIdle(); 29 message_loop_.RunUntilIdle();
31 } 30 }
32 31
33 virtual void SetUp() OVERRIDE { 32 virtual void SetUp() OVERRIDE {
34 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 33 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
35 persister_.reset( 34 persister_.reset(
36 new TransportSecurityPersister(&state_, temp_dir_.path(), false)); 35 new TransportSecurityPersister(&state_, temp_dir_.path(), false));
37 } 36 }
38 37
39 protected: 38 protected:
40 // Ordering is important here. If member variables are not destroyed in the 39 // Ordering is important here. If member variables are not destroyed in the
41 // right order, then DCHECKs will fail all over the place. 40 // right order, then DCHECKs will fail all over the place.
42 MessageLoop message_loop_; 41 base::MessageLoop message_loop_;
43 42
44 // Needed for ImportantFileWriter, which TransportSecurityPersister uses. 43 // Needed for ImportantFileWriter, which TransportSecurityPersister uses.
45 content::TestBrowserThread test_file_thread_; 44 content::TestBrowserThread test_file_thread_;
46 45
47 // TransportSecurityPersister runs on the IO thread. 46 // TransportSecurityPersister runs on the IO thread.
48 content::TestBrowserThread test_io_thread_; 47 content::TestBrowserThread test_io_thread_;
49 48
50 base::ScopedTempDir temp_dir_; 49 base::ScopedTempDir temp_dir_;
51 TransportSecurityState state_; 50 TransportSecurityState state_;
52 scoped_ptr<TransportSecurityPersister> persister_; 51 scoped_ptr<TransportSecurityPersister> persister_;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 "\"mode\": \"pinning-only\"" 224 "\"mode\": \"pinning-only\""
226 "}}"); 225 "}}");
227 226
228 EXPECT_TRUE(persister_->DeserializeFromCommandLine(preload)); 227 EXPECT_TRUE(persister_->DeserializeFromCommandLine(preload));
229 228
230 TransportSecurityState::DomainState domain_state; 229 TransportSecurityState::DomainState domain_state;
231 EXPECT_TRUE(state_.GetDomainState("docs.google.com", true, &domain_state)); 230 EXPECT_TRUE(state_.GetDomainState("docs.google.com", true, &domain_state));
232 EXPECT_FALSE(domain_state.HasPublicKeyPins()); 231 EXPECT_FALSE(domain_state.HasPublicKeyPins());
233 EXPECT_FALSE(domain_state.ShouldUpgradeToSSL()); 232 EXPECT_FALSE(domain_state.ShouldUpgradeToSSL());
234 } 233 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698