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

Side by Side Diff: chrome/browser/browsing_data/browsing_data_channel_id_helper_unittest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browsing_data/browsing_data_channel_id_helper.h" 5 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/test/base/testing_profile.h" 9 #include "chrome/test/base/testing_profile.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "content/public/test/test_browser_thread_bundle.h" 11 #include "content/public/test/test_browser_thread_bundle.h"
12 #include "net/ssl/channel_id_service.h" 12 #include "net/ssl/channel_id_service.h"
13 #include "net/url_request/url_request_context.h" 13 #include "net/url_request/url_request_context.h"
14 #include "net/url_request/url_request_context_getter.h" 14 #include "net/url_request/url_request_context_getter.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using content::BrowserThread; 17 using content::BrowserThread;
18 18
19 class BrowsingDataChannelIDHelperTest 19 class BrowsingDataChannelIDHelperTest
20 : public testing::Test, 20 : public testing::Test,
21 public net::SSLConfigService::Observer { 21 public net::SSLConfigService::Observer {
22 public: 22 public:
23 BrowsingDataChannelIDHelperTest() : ssl_config_changed_count_(0) { 23 BrowsingDataChannelIDHelperTest() : ssl_config_changed_count_(0) {
24 } 24 }
25 25
26 virtual void SetUp() OVERRIDE { 26 virtual void SetUp() override {
27 testing_profile_.reset(new TestingProfile()); 27 testing_profile_.reset(new TestingProfile());
28 28
29 testing_profile_->GetSSLConfigService()->AddObserver(this); 29 testing_profile_->GetSSLConfigService()->AddObserver(this);
30 } 30 }
31 31
32 virtual void TearDown() OVERRIDE { 32 virtual void TearDown() override {
33 testing_profile_->GetSSLConfigService()->RemoveObserver(this); 33 testing_profile_->GetSSLConfigService()->RemoveObserver(this);
34 } 34 }
35 35
36 void CreateChannelIDsForTest() { 36 void CreateChannelIDsForTest() {
37 net::URLRequestContext* context = 37 net::URLRequestContext* context =
38 testing_profile_->GetRequestContext()->GetURLRequestContext(); 38 testing_profile_->GetRequestContext()->GetURLRequestContext();
39 net::ChannelIDStore* channel_id_store = 39 net::ChannelIDStore* channel_id_store =
40 context->channel_id_service()->GetChannelIDStore(); 40 context->channel_id_service()->GetChannelIDStore();
41 channel_id_store->SetChannelID("https://www.google.com:443", 41 channel_id_store->SetChannelID("https://www.google.com:443",
42 base::Time(), base::Time(), 42 base::Time(), base::Time(),
43 "key", "cert"); 43 "key", "cert");
44 channel_id_store->SetChannelID("https://www.youtube.com:443", 44 channel_id_store->SetChannelID("https://www.youtube.com:443",
45 base::Time(), base::Time(), 45 base::Time(), base::Time(),
46 "key", "cert"); 46 "key", "cert");
47 } 47 }
48 48
49 void FetchCallback( 49 void FetchCallback(
50 const net::ChannelIDStore::ChannelIDList& channel_ids) { 50 const net::ChannelIDStore::ChannelIDList& channel_ids) {
51 DCHECK_CURRENTLY_ON(BrowserThread::UI); 51 DCHECK_CURRENTLY_ON(BrowserThread::UI);
52 channel_id_list_ = channel_ids; 52 channel_id_list_ = channel_ids;
53 } 53 }
54 54
55 // net::SSLConfigService::Observer implementation: 55 // net::SSLConfigService::Observer implementation:
56 virtual void OnSSLConfigChanged() OVERRIDE { 56 virtual void OnSSLConfigChanged() override {
57 ssl_config_changed_count_++; 57 ssl_config_changed_count_++;
58 } 58 }
59 59
60 protected: 60 protected:
61 content::TestBrowserThreadBundle thread_bundle_; 61 content::TestBrowserThreadBundle thread_bundle_;
62 scoped_ptr<TestingProfile> testing_profile_; 62 scoped_ptr<TestingProfile> testing_profile_;
63 63
64 net::ChannelIDStore::ChannelIDList channel_id_list_; 64 net::ChannelIDStore::ChannelIDList channel_id_list_;
65 65
66 int ssl_config_changed_count_; 66 int ssl_config_changed_count_;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 scoped_refptr<CannedBrowsingDataChannelIDHelper> helper( 137 scoped_refptr<CannedBrowsingDataChannelIDHelper> helper(
138 new CannedBrowsingDataChannelIDHelper()); 138 new CannedBrowsingDataChannelIDHelper());
139 139
140 ASSERT_TRUE(helper->empty()); 140 ASSERT_TRUE(helper->empty());
141 helper->AddChannelID(net::ChannelIDStore::ChannelID( 141 helper->AddChannelID(net::ChannelIDStore::ChannelID(
142 origin, base::Time(), base::Time(), "key", "cert")); 142 origin, base::Time(), base::Time(), "key", "cert"));
143 ASSERT_FALSE(helper->empty()); 143 ASSERT_FALSE(helper->empty());
144 helper->Reset(); 144 helper->Reset();
145 ASSERT_TRUE(helper->empty()); 145 ASSERT_TRUE(helper->empty());
146 } 146 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698