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

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

Issue 1081403002: Refactor safe-browsing build-config definitions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix collision Created 5 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 safebrowsing service using test safebrowsing database 5 // This test creates a safebrowsing service using test safebrowsing database
6 // and a test protocol manager. It is used to test logics in safebrowsing 6 // and a test protocol manager. It is used to test logics in safebrowsing
7 // service. 7 // service.
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 base::TimeDelta GetCheckTimeout(SafeBrowsingService* sb_service) { 481 base::TimeDelta GetCheckTimeout(SafeBrowsingService* sb_service) {
482 return sb_service->database_manager()->check_timeout_; 482 return sb_service->database_manager()->check_timeout_;
483 } 483 }
484 484
485 void SetCheckTimeout(SafeBrowsingService* sb_service, 485 void SetCheckTimeout(SafeBrowsingService* sb_service,
486 const base::TimeDelta& delay) { 486 const base::TimeDelta& delay) {
487 sb_service->database_manager()->check_timeout_ = delay; 487 sb_service->database_manager()->check_timeout_ = delay;
488 } 488 }
489 489
490 void CreateCSDService() { 490 void CreateCSDService() {
491 #if defined(SAFE_BROWSING_CSD)
491 safe_browsing::ClientSideDetectionService* csd_service = 492 safe_browsing::ClientSideDetectionService* csd_service =
492 safe_browsing::ClientSideDetectionService::Create(NULL); 493 safe_browsing::ClientSideDetectionService::Create(NULL);
493 SafeBrowsingService* sb_service = 494 SafeBrowsingService* sb_service =
494 g_browser_process->safe_browsing_service(); 495 g_browser_process->safe_browsing_service();
495 sb_service->csd_service_.reset(csd_service); 496 sb_service->csd_service_.reset(csd_service);
496 sb_service->RefreshState(); 497 sb_service->RefreshState();
498 #endif
497 } 499 }
498 500
499 void ProceedAndWhitelist( 501 void ProceedAndWhitelist(
500 const SafeBrowsingUIManager::UnsafeResource& resource) { 502 const SafeBrowsingUIManager::UnsafeResource& resource) {
501 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; 503 std::vector<SafeBrowsingUIManager::UnsafeResource> resources;
502 resources.push_back(resource); 504 resources.push_back(resource);
503 BrowserThread::PostTask( 505 BrowserThread::PostTask(
504 BrowserThread::IO, FROM_HERE, 506 BrowserThread::IO, FROM_HERE,
505 base::Bind(&SafeBrowsingUIManager::OnBlockingPageDone, 507 base::Bind(&SafeBrowsingUIManager::OnBlockingPageDone,
506 g_browser_process->safe_browsing_service()->ui_manager(), 508 g_browser_process->safe_browsing_service()->ui_manager(),
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 content::WindowedNotificationObserver observer( 1267 content::WindowedNotificationObserver observer(
1266 chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE, 1268 chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
1267 content::Source<SafeBrowsingDatabaseManager>( 1269 content::Source<SafeBrowsingDatabaseManager>(
1268 sb_service_->database_manager().get())); 1270 sb_service_->database_manager().get()));
1269 BrowserThread::PostTask( 1271 BrowserThread::PostTask(
1270 BrowserThread::IO, 1272 BrowserThread::IO,
1271 FROM_HERE, 1273 FROM_HERE,
1272 base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this)); 1274 base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this));
1273 observer.Wait(); 1275 observer.Wait();
1274 } 1276 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service.cc ('k') | chrome/browser/safe_browsing/safe_browsing_tab_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698