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

Side by Side Diff: chrome/browser/safe_browsing/download_protection_service_unittest.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 (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/safe_browsing/download_protection_service.h" 5 #include "chrome/browser/safe_browsing/download_protection_service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 // Returned pointer has the same lifespan as the database_manager_ refcounted 86 // Returned pointer has the same lifespan as the database_manager_ refcounted
87 // object. 87 // object.
88 MockSafeBrowsingDatabaseManager* mock_database_manager() { 88 MockSafeBrowsingDatabaseManager* mock_database_manager() {
89 return mock_database_manager_; 89 return mock_database_manager_;
90 } 90 }
91 91
92 protected: 92 protected:
93 virtual ~FakeSafeBrowsingService() { } 93 virtual ~FakeSafeBrowsingService() { }
94 94
95 virtual SafeBrowsingDatabaseManager* CreateDatabaseManager() OVERRIDE { 95 virtual SafeBrowsingDatabaseManager* CreateDatabaseManager() override {
96 mock_database_manager_ = new MockSafeBrowsingDatabaseManager(this); 96 mock_database_manager_ = new MockSafeBrowsingDatabaseManager(this);
97 return mock_database_manager_; 97 return mock_database_manager_;
98 } 98 }
99 99
100 virtual void RegisterAllDelayedAnalysis() OVERRIDE { } 100 virtual void RegisterAllDelayedAnalysis() override { }
101 101
102 private: 102 private:
103 MockSafeBrowsingDatabaseManager* mock_database_manager_; 103 MockSafeBrowsingDatabaseManager* mock_database_manager_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(FakeSafeBrowsingService); 105 DISALLOW_COPY_AND_ASSIGN(FakeSafeBrowsingService);
106 }; 106 };
107 107
108 class MockBinaryFeatureExtractor : public BinaryFeatureExtractor { 108 class MockBinaryFeatureExtractor : public BinaryFeatureExtractor {
109 public: 109 public:
110 MockBinaryFeatureExtractor() {} 110 MockBinaryFeatureExtractor() {}
(...skipping 13 matching lines...) Expand all
124 public: 124 public:
125 explicit TestURLFetcherWatcher(net::TestURLFetcherFactory* factory) 125 explicit TestURLFetcherWatcher(net::TestURLFetcherFactory* factory)
126 : factory_(factory), fetcher_id_(-1) { 126 : factory_(factory), fetcher_id_(-1) {
127 factory_->SetDelegateForTests(this); 127 factory_->SetDelegateForTests(this);
128 } 128 }
129 ~TestURLFetcherWatcher() { 129 ~TestURLFetcherWatcher() {
130 factory_->SetDelegateForTests(NULL); 130 factory_->SetDelegateForTests(NULL);
131 } 131 }
132 132
133 // TestURLFetcherDelegateForTests impl: 133 // TestURLFetcherDelegateForTests impl:
134 virtual void OnRequestStart(int fetcher_id) OVERRIDE { 134 virtual void OnRequestStart(int fetcher_id) override {
135 fetcher_id_ = fetcher_id; 135 fetcher_id_ = fetcher_id;
136 run_loop_.Quit(); 136 run_loop_.Quit();
137 } 137 }
138 virtual void OnChunkUpload(int fetcher_id) OVERRIDE {} 138 virtual void OnChunkUpload(int fetcher_id) override {}
139 virtual void OnRequestEnd(int fetcher_id) OVERRIDE {} 139 virtual void OnRequestEnd(int fetcher_id) override {}
140 140
141 int WaitForRequest() { 141 int WaitForRequest() {
142 run_loop_.Run(); 142 run_loop_.Run();
143 return fetcher_id_; 143 return fetcher_id_;
144 } 144 }
145 145
146 private: 146 private:
147 net::TestURLFetcherFactory* factory_; 147 net::TestURLFetcherFactory* factory_;
148 int fetcher_id_; 148 int fetcher_id_;
149 base::RunLoop run_loop_; 149 base::RunLoop run_loop_;
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 EXPECT_THAT(whitelist_strings, ElementsAre(cert_base + "/OU=unit")); 1584 EXPECT_THAT(whitelist_strings, ElementsAre(cert_base + "/OU=unit"));
1585 1585
1586 cert = ReadTestCertificate("test_c.pem"); 1586 cert = ReadTestCertificate("test_c.pem");
1587 ASSERT_TRUE(cert.get()); 1587 ASSERT_TRUE(cert.get());
1588 whitelist_strings.clear(); 1588 whitelist_strings.clear();
1589 GetCertificateWhitelistStrings( 1589 GetCertificateWhitelistStrings(
1590 *cert.get(), *issuer_cert.get(), &whitelist_strings); 1590 *cert.get(), *issuer_cert.get(), &whitelist_strings);
1591 EXPECT_THAT(whitelist_strings, ElementsAre()); 1591 EXPECT_THAT(whitelist_strings, ElementsAre());
1592 } 1592 }
1593 } // namespace safe_browsing 1593 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698