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

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

Issue 220493003: Safebrowsing: change gethash caching to match api 2.3 rules, fix some corner cases. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (including 227613008) Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/safe_browsing/database_manager.h" 10 #include "chrome/browser/safe_browsing/database_manager.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 std::vector<GURL>(), 73 std::vector<GURL>(),
74 std::vector<SBFullHash>(1, same_full_hash), 74 std::vector<SBFullHash>(1, same_full_hash),
75 NULL, 75 NULL,
76 list_type, 76 list_type,
77 expected_threats); 77 expected_threats);
78 db_manager_->checks_.insert(check); 78 db_manager_->checks_.insert(check);
79 79
80 const SBFullHashResult full_hash_result = { 80 const SBFullHashResult full_hash_result = {
81 same_full_hash, 81 same_full_hash,
82 result_list, 82 result_list,
83 0
84 }; 83 };
85 84
86 std::vector<SBFullHashResult> fake_results(1, full_hash_result); 85 std::vector<SBFullHashResult> fake_results(1, full_hash_result);
87 bool result = db_manager_->HandleOneCheck(check, fake_results); 86 bool result = db_manager_->HandleOneCheck(check, fake_results);
88 db_manager_->checks_.erase(check); 87 db_manager_->checks_.erase(check);
89 delete check; 88 delete check;
90 return result; 89 return result;
91 } 90 }
92 91
93 TEST_F(SafeBrowsingDatabaseManagerTest, CheckCorrespondsListType) { 92 TEST_F(SafeBrowsingDatabaseManagerTest, CheckCorrespondsListType) {
(...skipping 10 matching lines...) Expand all
104 std::vector<SBThreatType> multiple_threats; 103 std::vector<SBThreatType> multiple_threats;
105 multiple_threats.push_back(SB_THREAT_TYPE_URL_MALWARE); 104 multiple_threats.push_back(SB_THREAT_TYPE_URL_MALWARE);
106 multiple_threats.push_back(SB_THREAT_TYPE_URL_PHISHING); 105 multiple_threats.push_back(SB_THREAT_TYPE_URL_PHISHING);
107 EXPECT_FALSE(RunSBHashTest(safe_browsing_util::MALWARE, 106 EXPECT_FALSE(RunSBHashTest(safe_browsing_util::MALWARE,
108 multiple_threats, 107 multiple_threats,
109 safe_browsing_util::kBinUrlList)); 108 safe_browsing_util::kBinUrlList));
110 EXPECT_TRUE(RunSBHashTest(safe_browsing_util::MALWARE, 109 EXPECT_TRUE(RunSBHashTest(safe_browsing_util::MALWARE,
111 multiple_threats, 110 multiple_threats,
112 safe_browsing_util::kMalwareList)); 111 safe_browsing_util::kMalwareList));
113 } 112 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/database_manager.cc ('k') | chrome/browser/safe_browsing/protocol_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698