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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02_components_move
Patch Set: Bring back anon namespace. Remove safe_browsing:: wherever not needed. Created 5 years, 1 month 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
« chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h ('K') | « chrome/browser/safe_browsing/safe_browsing_service.cc ('k') | chrome/browser/safe_browsing/safe_browsing_store.h » ('j') | chrome/browser/safe_browsing/threat_details_cache.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 222cb7b9d30d3f2220a20e1a3f821c0679e748b8..f0f7b1192b89fabe6f2733c1e92b7c5322d8980a 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -70,6 +70,8 @@ using ::testing::_;
using ::testing::Mock;
using ::testing::StrictMock;
+namespace safe_browsing {
+
namespace {
void InvokeFullHashCallback(
@@ -138,8 +140,8 @@ class TestSafeBrowsingDatabase : public SafeBrowsingDatabase {
std::vector<SBPrefix>* prefix_hits,
std::vector<SBFullHashResult>* cache_hits) override {
cache_hits->clear();
- return ContainsUrl(safe_browsing::MALWARE,
- safe_browsing::PHISH,
+ return ContainsUrl(MALWARE,
+ PHISH,
std::vector<GURL>(1, url),
prefix_hits);
}
@@ -148,8 +150,8 @@ class TestSafeBrowsingDatabase : public SafeBrowsingDatabase {
std::vector<SBPrefix>* prefix_hits,
std::vector<SBFullHashResult>* cache_hits) override {
cache_hits->clear();
- return ContainsUrl(safe_browsing::UNWANTEDURL,
- safe_browsing::UNWANTEDURL,
+ return ContainsUrl(UNWANTEDURL,
+ UNWANTEDURL,
std::vector<GURL>(1, url),
prefix_hits);
}
@@ -157,8 +159,8 @@ class TestSafeBrowsingDatabase : public SafeBrowsingDatabase {
const std::vector<SBPrefix>& prefixes,
std::vector<SBPrefix>* prefix_hits) override {
bool found =
- ContainsUrlPrefixes(safe_browsing::BINURL,
- safe_browsing::BINURL, prefixes, prefix_hits);
+ ContainsUrlPrefixes(BINURL,
+ BINURL, prefixes, prefix_hits);
if (!found)
return false;
DCHECK_LE(1U, prefix_hits->size());
@@ -424,8 +426,8 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
SBFullHashResult* full_hash) {
std::string host;
std::string path;
- safe_browsing::CanonicalizeUrl(url, &host, &path, NULL);
- full_hash->hash = safe_browsing::SBFullHashForString(host + path);
+ CanonicalizeUrl(url, &host, &path, NULL);
+ full_hash->hash = SBFullHashForString(host + path);
full_hash->list_id = list_id;
}
@@ -527,8 +529,8 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
void CreateCSDService() {
#if defined(SAFE_BROWSING_CSD)
- safe_browsing::ClientSideDetectionService* csd_service =
- safe_browsing::ClientSideDetectionService::Create(NULL);
+ ClientSideDetectionService* csd_service =
+ ClientSideDetectionService::Create(NULL);
SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
@@ -601,19 +603,19 @@ class SafeBrowsingServiceMetadataTest
void GenUrlFullhashResultWithMetadata(const GURL& url,
SBFullHashResult* full_hash) {
- GenUrlFullhashResult(url, safe_browsing::MALWARE, full_hash);
+ GenUrlFullhashResult(url, MALWARE, full_hash);
- safe_browsing::MalwarePatternType proto;
+ MalwarePatternType proto;
switch (GetParam()) {
case METADATA_NONE:
full_hash->metadata = std::string();
break;
case METADATA_LANDING:
- proto.set_pattern_type(safe_browsing::MalwarePatternType::LANDING);
+ proto.set_pattern_type(MalwarePatternType::LANDING);
full_hash->metadata = proto.SerializeAsString();
break;
case METADATA_DISTRIBUTION:
- proto.set_pattern_type(safe_browsing::MalwarePatternType::DISTRIBUTION);
+ proto.set_pattern_type(MalwarePatternType::DISTRIBUTION);
full_hash->metadata = proto.SerializeAsString();
break;
}
@@ -712,7 +714,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, UnwantedImgIgnored) {
// Add the img url as coming from a site serving UwS and then load the parent
// page.
SBFullHashResult uws_full_hash;
- GenUrlFullhashResult(img_url, safe_browsing::UNWANTEDURL,
+ GenUrlFullhashResult(img_url, UNWANTEDURL,
&uws_full_hash);
SetupResponseForUrl(img_url, uws_full_hash);
@@ -727,7 +729,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, DISABLED_MalwareWithWhitelist) {
// After adding the url to safebrowsing database and getfullhash result,
// we should see the interstitial page.
SBFullHashResult malware_full_hash;
- GenUrlFullhashResult(url, safe_browsing::MALWARE, &malware_full_hash);
+ GenUrlFullhashResult(url, MALWARE, &malware_full_hash);
EXPECT_CALL(observer_,
OnSafeBrowsingMatch(IsUnsafeResourceFor(url))).Times(1);
EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(url))).Times(1)
@@ -781,7 +783,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, Prefetch) {
// getfullhash result, we should not see the interstitial page since the
// only malware was a prefetch target.
SBFullHashResult malware_full_hash;
- GenUrlFullhashResult(malware_url, safe_browsing::MALWARE,
+ GenUrlFullhashResult(malware_url, MALWARE,
&malware_full_hash);
SetupResponseForUrl(malware_url, malware_full_hash);
ui_test_utils::NavigateToURL(browser(), url);
@@ -896,7 +898,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckDownloadUrl) {
EXPECT_EQ(SB_THREAT_TYPE_SAFE, client->GetThreatType());
SBFullHashResult full_hash_result;
- GenUrlFullhashResult(badbin_url, safe_browsing::BINURL,
+ GenUrlFullhashResult(badbin_url, BINURL,
&full_hash_result);
SetupResponseForUrl(badbin_url, full_hash_result);
@@ -918,7 +920,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckUnwantedSoftwareUrl) {
SBFullHashResult full_hash_result;
GenUrlFullhashResult(
- bad_url, safe_browsing::UNWANTEDURL, &full_hash_result);
+ bad_url, UNWANTEDURL, &full_hash_result);
SetupResponseForUrl(bad_url, full_hash_result);
// Now, the bad_url is not safe since it is added to download
@@ -940,7 +942,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckUnwantedSoftwareUrl) {
SBFullHashResult full_hash_result;
GenUrlFullhashResult(
- bad_url, safe_browsing::MALWARE, &full_hash_result);
+ bad_url, MALWARE, &full_hash_result);
SetupResponseForUrl(bad_url, full_hash_result);
client->CheckBrowseUrl(bad_url);
@@ -960,7 +962,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckBrowseUrl) {
SBFullHashResult full_hash_result;
GenUrlFullhashResult(
- bad_url, safe_browsing::MALWARE, &full_hash_result);
+ bad_url, MALWARE, &full_hash_result);
SetupResponseForUrl(bad_url, full_hash_result);
// Now, the bad_url is not safe since it is added to download
@@ -983,7 +985,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckBrowseUrl) {
SBFullHashResult full_hash_result;
GenUrlFullhashResult(
- bad_url, safe_browsing::UNWANTEDURL, &full_hash_result);
+ bad_url, UNWANTEDURL, &full_hash_result);
SetupResponseForUrl(bad_url, full_hash_result);
client->CheckBrowseUrl(bad_url);
@@ -1007,7 +1009,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckDownloadUrlRedirects) {
EXPECT_EQ(SB_THREAT_TYPE_SAFE, client->GetThreatType());
SBFullHashResult full_hash_result;
- GenUrlFullhashResult(badbin_url, safe_browsing::BINURL,
+ GenUrlFullhashResult(badbin_url, BINURL,
&full_hash_result);
SetupResponseForUrl(badbin_url, full_hash_result);
@@ -1030,7 +1032,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
scoped_refptr<TestSBClient> client(new TestSBClient);
SBFullHashResult full_hash_result;
- GenUrlFullhashResult(badbin_url, safe_browsing::BINURL,
+ GenUrlFullhashResult(badbin_url, BINURL,
&full_hash_result);
SetupResponseForUrl(badbin_url, full_hash_result);
client->CheckDownloadUrl(badbin_urls);
@@ -1057,7 +1059,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, StartAndStop) {
CreateCSDService();
SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
- safe_browsing::ClientSideDetectionService* csd_service =
+ ClientSideDetectionService* csd_service =
sb_service->safe_browsing_detection_service();
PrefService* pref_service = browser()->profile()->GetPrefs();
@@ -1156,7 +1158,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceShutdownTest,
DontStartAfterShutdown) {
CreateCSDService();
SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
- safe_browsing::ClientSideDetectionService* csd_service =
+ ClientSideDetectionService* csd_service =
sb_service->safe_browsing_detection_service();
PrefService* pref_service = browser()->profile()->GetPrefs();
@@ -1360,3 +1362,5 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingDatabaseManagerCookieTest,
base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this));
observer.Wait();
}
+
+} // namespace safe_browsing
« chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h ('K') | « chrome/browser/safe_browsing/safe_browsing_service.cc ('k') | chrome/browser/safe_browsing/safe_browsing_store.h » ('j') | chrome/browser/safe_browsing/threat_details_cache.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698