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

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

Issue 2821193005: Rewrite base::Bind to base::BindOnce with base_bind_rewriters in //chrome/browser/safe_browsing (Closed)
Patch Set: Created 3 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
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 // This test creates a fake safebrowsing service, where we can inject known- 5 // This test creates a fake safebrowsing service, where we can inject known-
6 // threat urls. It then uses a real browser to go to these urls, and sends 6 // threat urls. It then uses a real browser to go to these urls, and sends
7 // "goback" or "proceed" commands and verifies they work. 7 // "goback" or "proceed" commands and verifies they work.
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // Otherwise it returns false, and "client" is called asynchronously with the 92 // Otherwise it returns false, and "client" is called asynchronously with the
93 // result when it is ready. 93 // result when it is ready.
94 // Overrides SafeBrowsingDatabaseManager::CheckBrowseUrl. 94 // Overrides SafeBrowsingDatabaseManager::CheckBrowseUrl.
95 bool CheckBrowseUrl(const GURL& gurl, Client* client) override { 95 bool CheckBrowseUrl(const GURL& gurl, Client* client) override {
96 if (badurls.find(gurl.spec()) == badurls.end() || 96 if (badurls.find(gurl.spec()) == badurls.end() ||
97 badurls.at(gurl.spec()) == SB_THREAT_TYPE_SAFE) 97 badurls.at(gurl.spec()) == SB_THREAT_TYPE_SAFE)
98 return true; 98 return true;
99 99
100 BrowserThread::PostTask( 100 BrowserThread::PostTask(
101 BrowserThread::IO, FROM_HERE, 101 BrowserThread::IO, FROM_HERE,
102 base::Bind(&FakeSafeBrowsingDatabaseManager::OnCheckBrowseURLDone, 102 base::BindOnce(&FakeSafeBrowsingDatabaseManager::OnCheckBrowseURLDone,
103 this, gurl, client)); 103 this, gurl, client));
104 return false; 104 return false;
105 } 105 }
106 106
107 void OnCheckBrowseURLDone(const GURL& gurl, Client* client) { 107 void OnCheckBrowseURLDone(const GURL& gurl, Client* client) {
108 std::vector<SBThreatType> expected_threats; 108 std::vector<SBThreatType> expected_threats;
109 // TODO(nparker): Remove ref to LocalSafeBrowsingDatabase by calling 109 // TODO(nparker): Remove ref to LocalSafeBrowsingDatabase by calling
110 // client->OnCheckBrowseUrlResult(..) directly. 110 // client->OnCheckBrowseUrlResult(..) directly.
111 expected_threats.push_back(SB_THREAT_TYPE_URL_MALWARE); 111 expected_threats.push_back(SB_THREAT_TYPE_URL_MALWARE);
112 expected_threats.push_back(SB_THREAT_TYPE_URL_PHISHING); 112 expected_threats.push_back(SB_THREAT_TYPE_URL_PHISHING);
113 expected_threats.push_back(SB_THREAT_TYPE_URL_UNWANTED); 113 expected_threats.push_back(SB_THREAT_TYPE_URL_UNWANTED);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 FakeSafeBrowsingUIManager() 158 FakeSafeBrowsingUIManager()
159 : TestSafeBrowsingUIManager(), threat_details_done_(false) {} 159 : TestSafeBrowsingUIManager(), threat_details_done_(false) {}
160 explicit FakeSafeBrowsingUIManager(SafeBrowsingService* service) 160 explicit FakeSafeBrowsingUIManager(SafeBrowsingService* service)
161 : TestSafeBrowsingUIManager(service), threat_details_done_(false) {} 161 : TestSafeBrowsingUIManager(service), threat_details_done_(false) {}
162 162
163 // Overrides SafeBrowsingUIManager 163 // Overrides SafeBrowsingUIManager
164 void SendSerializedThreatDetails(const std::string& serialized) override { 164 void SendSerializedThreatDetails(const std::string& serialized) override {
165 // Notify the UI thread that we got a report. 165 // Notify the UI thread that we got a report.
166 BrowserThread::PostTask( 166 BrowserThread::PostTask(
167 BrowserThread::UI, FROM_HERE, 167 BrowserThread::UI, FROM_HERE,
168 base::Bind(&FakeSafeBrowsingUIManager::OnThreatDetailsDone, this, 168 base::BindOnce(&FakeSafeBrowsingUIManager::OnThreatDetailsDone, this,
169 serialized)); 169 serialized));
170 } 170 }
171 171
172 void OnThreatDetailsDone(const std::string& serialized) { 172 void OnThreatDetailsDone(const std::string& serialized) {
173 if (threat_details_done_) { 173 if (threat_details_done_) {
174 return; 174 return;
175 } 175 }
176 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI)); 176 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
177 report_ = serialized; 177 report_ = serialized;
178 178
179 EXPECT_FALSE(threat_details_done_callback_.is_null()); 179 EXPECT_FALSE(threat_details_done_callback_.is_null());
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 "force-fieldtrial-params", 347 "force-fieldtrial-params",
348 "SBDomStudy.SBDomGroup:tag_attribute_csv/div%2Cfoo%2Cdiv%2Cbaz"); 348 "SBDomStudy.SBDomGroup:tag_attribute_csv/div%2Cfoo%2Cdiv%2Cbaz");
349 349
350 if (testing::get<1>(GetParam())) 350 if (testing::get<1>(GetParam()))
351 content::IsolateAllSitesForTesting(command_line); 351 content::IsolateAllSitesForTesting(command_line);
352 } 352 }
353 353
354 void SetUpOnMainThread() override { 354 void SetUpOnMainThread() override {
355 BrowserThread::PostTask( 355 BrowserThread::PostTask(
356 BrowserThread::IO, FROM_HERE, 356 BrowserThread::IO, FROM_HERE,
357 base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true)); 357 base::BindOnce(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
358 } 358 }
359 359
360 void SetURLThreatType(const GURL& url, SBThreatType threat_type) { 360 void SetURLThreatType(const GURL& url, SBThreatType threat_type) {
361 TestSafeBrowsingService* service = factory_.test_safe_browsing_service(); 361 TestSafeBrowsingService* service = factory_.test_safe_browsing_service();
362 ASSERT_TRUE(service); 362 ASSERT_TRUE(service);
363 363
364 static_cast<FakeSafeBrowsingDatabaseManager*>( 364 static_cast<FakeSafeBrowsingDatabaseManager*>(
365 service->database_manager().get()) 365 service->database_manager().get())
366 ->SetURLThreatType(url, threat_type); 366 ->SetURLThreatType(url, threat_type);
367 } 367 }
(...skipping 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 1437
1438 INSTANTIATE_TEST_CASE_P( 1438 INSTANTIATE_TEST_CASE_P(
1439 SafeBrowsingBlockingPageIDNTestWithThreatType, 1439 SafeBrowsingBlockingPageIDNTestWithThreatType,
1440 SafeBrowsingBlockingPageIDNTest, 1440 SafeBrowsingBlockingPageIDNTest,
1441 testing::Combine(testing::Values(false, true), 1441 testing::Combine(testing::Values(false, true),
1442 testing::Values(SB_THREAT_TYPE_URL_MALWARE, 1442 testing::Values(SB_THREAT_TYPE_URL_MALWARE,
1443 SB_THREAT_TYPE_URL_PHISHING, 1443 SB_THREAT_TYPE_URL_PHISHING,
1444 SB_THREAT_TYPE_URL_UNWANTED))); 1444 SB_THREAT_TYPE_URL_UNWANTED)));
1445 1445
1446 } // namespace safe_browsing 1446 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698