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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/safe_browsing/threat_dom_details_browsertest.cc

Issue 1414343007: Collect threat details for phishing and UwS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit 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/common/safe_browsing/csd.proto ('K') | « chrome/renderer/safe_browsing/threat_dom_details.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/safe_browsing/threat_dom_details_browsertest.cc
diff --git a/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc b/chrome/renderer/safe_browsing/threat_dom_details_browsertest.cc
similarity index 72%
rename from chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc
rename to chrome/renderer/safe_browsing/threat_dom_details_browsertest.cc
index e4ef1e649a1f3435715c1438ee384af09b3cb70b..becab0dabfc589f680e7f33d1608d5b11c174c94 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc
+++ b/chrome/renderer/safe_browsing/threat_dom_details_browsertest.cc
@@ -4,43 +4,42 @@
#include "base/strings/stringprintf.h"
#include "chrome/common/safe_browsing/safebrowsing_messages.h"
-#include "chrome/renderer/safe_browsing/malware_dom_details.h"
+#include "chrome/renderer/safe_browsing/threat_dom_details.h"
#include "chrome/test/base/chrome_render_view_test.h"
#include "net/base/escape.h"
-typedef ChromeRenderViewTest MalwareDOMDetailsTest;
+typedef ChromeRenderViewTest ThreatDOMDetailsTest;
-
-TEST_F(MalwareDOMDetailsTest, Everything) {
- scoped_ptr<safe_browsing::MalwareDOMDetails> details(
- safe_browsing::MalwareDOMDetails::Create(view_));
+TEST_F(ThreatDOMDetailsTest, Everything) {
+ scoped_ptr<safe_browsing::ThreatDOMDetails> details(
+ safe_browsing::ThreatDOMDetails::Create(view_));
// Lower kMaxNodes for the test. Loading 500 subframes in a
// debug build takes a while.
details->kMaxNodes = 50;
const char urlprefix[] = "data:text/html;charset=utf-8,";
- { // An page with an internal script
+ { // An page with an internal script
std::string html = "<html><head><script></script></head></html>";
LoadHTML(html.c_str());
- std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+ std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
details->ExtractResources(&params);
ASSERT_EQ(1u, params.size());
EXPECT_EQ(GURL(urlprefix + html), params[0].url);
}
- { // A page with 2 external scripts.
+ { // A page with 2 external scripts.
// Note: This part of the test causes 2 leaks: LEAK: 5 WebCoreNode
// LEAK: 2 CachedResource.
GURL script1_url("data:text/javascript;charset=utf-8,var a=1;");
GURL script2_url("data:text/javascript;charset=utf-8,var b=2;");
std::string html = "<html><head><script src=\"" + script1_url.spec() +
- "\"></script><script src=\"" + script2_url.spec() +
- "\"></script></head></html>";
+ "\"></script><script src=\"" + script2_url.spec() +
+ "\"></script></head></html>";
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+ std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
details->ExtractResources(&params);
ASSERT_EQ(3u, params.size());
EXPECT_EQ(script1_url, params[0].url);
@@ -50,21 +49,23 @@ TEST_F(MalwareDOMDetailsTest, Everything) {
EXPECT_EQ(url, params[2].url);
}
- { // A page with an iframe which in turn contains an iframe.
+ { // A page with an iframe which in turn contains an iframe.
// html
// \ iframe1
// \ iframe2
std::string iframe2_html = "<html><body>iframe2</body></html>";
GURL iframe2_url(urlprefix + iframe2_html);
- std::string iframe1_html = "<iframe src=\"" + net::EscapeForHTML(
- iframe2_url.spec()) + "\"></iframe>";
+ std::string iframe1_html = "<iframe src=\"" +
+ net::EscapeForHTML(iframe2_url.spec()) +
+ "\"></iframe>";
GURL iframe1_url(urlprefix + iframe1_html);
- std::string html = "<html><head><iframe src=\"" + net::EscapeForHTML(
- iframe1_url.spec()) + "\"></iframe></head></html>";
+ std::string html = "<html><head><iframe src=\"" +
+ net::EscapeForHTML(iframe1_url.spec()) +
+ "\"></iframe></head></html>";
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+ std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
details->ExtractResources(&params);
ASSERT_EQ(5u, params.size());
@@ -96,34 +97,34 @@ TEST_F(MalwareDOMDetailsTest, Everything) {
EXPECT_EQ(0u, params[4].children.size());
}
- { // >50 subframes, to verify kMaxNodes.
+ { // >50 subframes, to verify kMaxNodes.
std::string html;
for (int i = 0; i < 55; ++i) {
// The iframe contents is just a number.
GURL iframe_url(base::StringPrintf("%s%d", urlprefix, i));
html += "<iframe src=\"" + net::EscapeForHTML(iframe_url.spec()) +
- "\"></iframe>";
+ "\"></iframe>";
}
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+ std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
details->ExtractResources(&params);
ASSERT_EQ(51u, params.size());
}
- { // A page with >50 scripts, to verify kMaxNodes.
+ { // A page with >50 scripts, to verify kMaxNodes.
std::string html;
for (int i = 0; i < 55; ++i) {
// The iframe contents is just a number.
GURL script_url(base::StringPrintf("%s%d", urlprefix, i));
html += "<script src=\"" + net::EscapeForHTML(script_url.spec()) +
- "\"></script>";
+ "\"></script>";
}
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+ std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node> params;
details->ExtractResources(&params);
ASSERT_EQ(51u, params.size());
}
« chrome/common/safe_browsing/csd.proto ('K') | « chrome/renderer/safe_browsing/threat_dom_details.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698