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

Side by Side Diff: chrome/browser/safe_browsing/certificate_reporting_service_test_utils.h

Issue 2909123003: Replace deprecated base::NonThreadSafe in chrome/browser/safe_browsing in favor of SequenceChecker. (Closed)
Patch Set: remove include too Created 3 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_SAFE_BROWSING_CERTIFICATE_REPORTING_SERVICE_TEST_UTILS_H_ 5 #ifndef CHROME_BROWSER_SAFE_BROWSING_CERTIFICATE_REPORTING_SERVICE_TEST_UTILS_H_
6 #define CHROME_BROWSER_SAFE_BROWSING_CERTIFICATE_REPORTING_SERVICE_TEST_UTILS_H_ 6 #define CHROME_BROWSER_SAFE_BROWSING_CERTIFICATE_REPORTING_SERVICE_TEST_UTILS_H_
7 7
8 #include <unordered_map> 8 #include <unordered_map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/threading/non_thread_safe.h" 12 #include "base/sequence_checker.h"
13 #include "chrome/browser/safe_browsing/certificate_reporting_service.h" 13 #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
14 #include "content/public/test/test_browser_thread.h" 14 #include "content/public/test/test_browser_thread.h"
15 #include "content/public/test/test_browser_thread_bundle.h" 15 #include "content/public/test/test_browser_thread_bundle.h"
16 #include "net/base/network_delegate_impl.h" 16 #include "net/base/network_delegate_impl.h"
17 #include "net/url_request/url_request_interceptor.h" 17 #include "net/url_request/url_request_interceptor.h"
18 #include "net/url_request/url_request_job.h" 18 #include "net/url_request/url_request_job.h"
19 19
20 namespace net { 20 namespace net {
21 class NetworkDelegate; 21 class NetworkDelegate;
22 } 22 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 ObservedReportMap successful_reports_; 94 ObservedReportMap successful_reports_;
95 ObservedReportMap failed_reports_; 95 ObservedReportMap failed_reports_;
96 ObservedReportMap delayed_reports_; 96 ObservedReportMap delayed_reports_;
97 }; 97 };
98 98
99 // A URLRequestJob that can be delayed until Resume() is called. Returns an 99 // A URLRequestJob that can be delayed until Resume() is called. Returns an
100 // empty response. If Resume() is called before a request is made, then the 100 // empty response. If Resume() is called before a request is made, then the
101 // request will not be delayed. If not delayed, it can return a failed or a 101 // request will not be delayed. If not delayed, it can return a failed or a
102 // successful URL request job. 102 // successful URL request job.
103 class DelayableCertReportURLRequestJob : public net::URLRequestJob, 103 class DelayableCertReportURLRequestJob : public net::URLRequestJob {
104 public base::NonThreadSafe {
105 public: 104 public:
106 DelayableCertReportURLRequestJob( 105 DelayableCertReportURLRequestJob(
107 bool delayed, 106 bool delayed,
108 bool should_fail, 107 bool should_fail,
109 net::URLRequest* request, 108 net::URLRequest* request,
110 net::NetworkDelegate* network_delegate, 109 net::NetworkDelegate* network_delegate,
111 const base::Callback<void()>& destruction_callback); 110 const base::Callback<void()>& destruction_callback);
112 ~DelayableCertReportURLRequestJob() override; 111 ~DelayableCertReportURLRequestJob() override;
113 112
114 base::WeakPtr<DelayableCertReportURLRequestJob> GetWeakPtr(); 113 base::WeakPtr<DelayableCertReportURLRequestJob> GetWeakPtr();
115 114
116 // net::URLRequestJob methods: 115 // net::URLRequestJob methods:
117 void Start() override; 116 void Start() override;
118 int ReadRawData(net::IOBuffer* buf, int buf_size) override; 117 int ReadRawData(net::IOBuffer* buf, int buf_size) override;
119 void GetResponseInfo(net::HttpResponseInfo* info) override; 118 void GetResponseInfo(net::HttpResponseInfo* info) override;
120 119
121 // Resumes a previously started request that was delayed. If no 120 // Resumes a previously started request that was delayed. If no
122 // request has been started yet, then when Start() is called it will 121 // request has been started yet, then when Start() is called it will
123 // not delay. 122 // not delay.
124 void Resume(); 123 void Resume();
125 124
126 private: 125 private:
127 bool delayed_; 126 bool delayed_;
128 bool should_fail_; 127 bool should_fail_;
129 bool started_; 128 bool started_;
130 base::Callback<void()> destruction_callback_; 129 base::Callback<void()> destruction_callback_;
130
131 SEQUENCE_CHECKER(sequence_checker_);
132
131 base::WeakPtrFactory<DelayableCertReportURLRequestJob> weak_factory_; 133 base::WeakPtrFactory<DelayableCertReportURLRequestJob> weak_factory_;
132 134
133 DISALLOW_COPY_AND_ASSIGN(DelayableCertReportURLRequestJob); 135 DISALLOW_COPY_AND_ASSIGN(DelayableCertReportURLRequestJob);
134 }; 136 };
135 137
136 // A job interceptor that returns a failed, succesful or delayed request job. 138 // A job interceptor that returns a failed, succesful or delayed request job.
137 // Used to simulate report uploads that fail, succeed or hang. 139 // Used to simulate report uploads that fail, succeed or hang.
138 class CertReportJobInterceptor : public net::URLRequestInterceptor { 140 class CertReportJobInterceptor : public net::URLRequestInterceptor {
139 public: 141 public:
140 CertReportJobInterceptor(ReportSendingResult expected_report_result, 142 CertReportJobInterceptor(ReportSendingResult expected_report_result,
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 238
237 uint8_t server_public_key_[32]; 239 uint8_t server_public_key_[32];
238 uint8_t server_private_key_[32]; 240 uint8_t server_private_key_[32];
239 241
240 DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceTestHelper); 242 DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceTestHelper);
241 }; 243 };
242 244
243 } // namespace certificate_reporting_test_utils 245 } // namespace certificate_reporting_test_utils
244 246
245 #endif // CHROME_BROWSER_SAFE_BROWSING_CERTIFICATE_REPORTING_SERVICE_TEST_UTILS _H_ 247 #endif // CHROME_BROWSER_SAFE_BROWSING_CERTIFICATE_REPORTING_SERVICE_TEST_UTILS _H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698