chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc - Issue 351553004: Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

Issue 351553004: Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Linux ASAN tests Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/safe_browsing/browser_feature_extractor.cc ('k') | chrome/browser/safe_browsing/client_side_detection_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

index 7bf9b271a1aead732068fcc0b2a810d1393a3603..c3bc13fd37abc50a939a74a019c352b8855ce009 100644

--- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

+++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

@@ -210,9 +210,13 @@ class BrowserFeatureExtractorTest : public ChromeRenderViewHostTestHarness {

scoped_refptr<StrictMock<MockSafeBrowsingDatabaseManager> > db_manager_;

private:

- void ExtractFeaturesDone(bool success, ClientPhishingRequest* request) {

- ASSERT_EQ(0U, success_.count(request));

- success_[request] = success;

+ void ExtractFeaturesDone(bool success,

+ scoped_ptr<ClientPhishingRequest> request) {

+ EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ ASSERT_EQ(0U, success_.count(request.get()));

+ // The pointer doesn't really belong to us. It belongs to

+ // the test case which passed it to ExtractFeatures above.

+ success_[request.release()] = success;

if (--num_pending_ == 0) {

base::MessageLoop::current()->Quit();

}