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

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

Issue 397853002: Refactor safe-browsing build-config definitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to satiate trybots Created 6 years, 4 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 | Annotate | Revision Log
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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 base::TimeDelta GetCheckTimeout(SafeBrowsingService* sb_service) { 448 base::TimeDelta GetCheckTimeout(SafeBrowsingService* sb_service) {
449 return sb_service->database_manager()->check_timeout_; 449 return sb_service->database_manager()->check_timeout_;
450 } 450 }
451 451
452 void SetCheckTimeout(SafeBrowsingService* sb_service, 452 void SetCheckTimeout(SafeBrowsingService* sb_service,
453 const base::TimeDelta& delay) { 453 const base::TimeDelta& delay) {
454 sb_service->database_manager()->check_timeout_ = delay; 454 sb_service->database_manager()->check_timeout_ = delay;
455 } 455 }
456 456
457 void CreateCSDService() { 457 void CreateCSDService() {
458 #if defined(SAFE_BROWSING_CSD)
458 safe_browsing::ClientSideDetectionService* csd_service = 459 safe_browsing::ClientSideDetectionService* csd_service =
459 safe_browsing::ClientSideDetectionService::Create(NULL); 460 safe_browsing::ClientSideDetectionService::Create(NULL);
460 SafeBrowsingService* sb_service = 461 SafeBrowsingService* sb_service =
461 g_browser_process->safe_browsing_service(); 462 g_browser_process->safe_browsing_service();
462 sb_service->csd_service_.reset(csd_service); 463 sb_service->csd_service_.reset(csd_service);
463 sb_service->RefreshState(); 464 sb_service->RefreshState();
465 #endif
464 } 466 }
465 467
466 void ProceedAndWhitelist( 468 void ProceedAndWhitelist(
467 const SafeBrowsingUIManager::UnsafeResource& resource) { 469 const SafeBrowsingUIManager::UnsafeResource& resource) {
468 std::vector<SafeBrowsingUIManager::UnsafeResource> resources; 470 std::vector<SafeBrowsingUIManager::UnsafeResource> resources;
469 resources.push_back(resource); 471 resources.push_back(resource);
470 BrowserThread::PostTask( 472 BrowserThread::PostTask(
471 BrowserThread::IO, FROM_HERE, 473 BrowserThread::IO, FROM_HERE,
472 base::Bind(&SafeBrowsingUIManager::OnBlockingPageDone, 474 base::Bind(&SafeBrowsingUIManager::OnBlockingPageDone,
473 g_browser_process->safe_browsing_service()->ui_manager(), 475 g_browser_process->safe_browsing_service()->ui_manager(),
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 content::WindowedNotificationObserver observer( 1006 content::WindowedNotificationObserver observer(
1005 chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE, 1007 chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
1006 content::Source<SafeBrowsingDatabaseManager>( 1008 content::Source<SafeBrowsingDatabaseManager>(
1007 sb_service_->database_manager().get())); 1009 sb_service_->database_manager().get()));
1008 BrowserThread::PostTask( 1010 BrowserThread::PostTask(
1009 BrowserThread::IO, 1011 BrowserThread::IO,
1010 FROM_HERE, 1012 FROM_HERE,
1011 base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this)); 1013 base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this));
1012 observer.Wait(); 1014 observer.Wait();
1013 } 1015 }
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