summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/safe_browsing
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer/safe_browsing')
-rw-r--r--chrome/renderer/safe_browsing/malware_dom_details.cc29
-rw-r--r--chrome/renderer/safe_browsing/malware_dom_details.h13
-rw-r--r--chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc76
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_delegate.cc5
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc2
5 files changed, 62 insertions, 63 deletions
diff --git a/chrome/renderer/safe_browsing/malware_dom_details.cc b/chrome/renderer/safe_browsing/malware_dom_details.cc
index 79624dd..6a03295 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details.cc
+++ b/chrome/renderer/safe_browsing/malware_dom_details.cc
@@ -6,8 +6,7 @@
#include "base/compiler_specific.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
+#include "chrome/common/safebrowsing_messages.h"
#include "content/renderer/render_view.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
@@ -32,22 +31,22 @@ MalwareDOMDetails::~MalwareDOMDetails() {
bool MalwareDOMDetails::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(MalwareDOMDetails, message)
- IPC_MESSAGE_HANDLER(ViewMsg_GetMalwareDOMDetails, OnGetMalwareDOMDetails)
+ IPC_MESSAGE_HANDLER(SafeBrowsingMsg_GetMalwareDOMDetails, OnGetMalwareDOMDetails)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
}
void MalwareDOMDetails::OnGetMalwareDOMDetails() {
- ViewHostMsg_MalwareDOMDetails_Params resources;
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> resources;
ExtractResources(&resources);
// Notify the browser.
- render_view()->Send(new ViewHostMsg_MalwareDOMDetails(
+ render_view()->Send(new SafeBrowsingHostMsg_MalwareDOMDetails(
render_view()->routing_id(), resources));
}
void MalwareDOMDetails::ExtractResources(
- ViewHostMsg_MalwareDOMDetails_Params* resources) {
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>* resources) {
WebKit::WebView* web_view = render_view_->webview();
if (!web_view) {
NOTREACHED();
@@ -57,12 +56,12 @@ void MalwareDOMDetails::ExtractResources(
for (; cur_frame;
cur_frame = cur_frame->traverseNext(false /* don't wrap around */)) {
DCHECK(cur_frame);
- ViewHostMsg_MalwareDOMDetails_Node frame_node;
+ SafeBrowsingHostMsg_MalwareDOMDetails_Node frame_node;
frame_node.url = GURL(cur_frame->url());
WebKit::WebDocument doc = cur_frame->document();
if (doc.isNull()) {
// Nothing in this frame, move on to the next one.
- resources->nodes.push_back(frame_node);
+ resources->push_back(frame_node);
continue;
}
@@ -76,22 +75,22 @@ void MalwareDOMDetails::ExtractResources(
if (element.hasTagName("iframe") || element.hasTagName("frame") ||
element.hasTagName("embed") || element.hasTagName("script")) {
HandleElement(element, &frame_node, resources);
- if (resources->nodes.size() >= kMaxNodes) {
+ if (resources->size() >= kMaxNodes) {
// We have reached kMaxNodes, exit early.
- resources->nodes.push_back(frame_node);
+ resources->push_back(frame_node);
return;
}
}
}
- resources->nodes.push_back(frame_node);
+ resources->push_back(frame_node);
}
}
void MalwareDOMDetails::HandleElement(
const WebKit::WebElement& element,
- ViewHostMsg_MalwareDOMDetails_Node* parent_node,
- ViewHostMsg_MalwareDOMDetails_Params* resources) {
+ SafeBrowsingHostMsg_MalwareDOMDetails_Node* parent_node,
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>* resources) {
if (!element.hasAttribute("src")) {
return;
}
@@ -106,11 +105,11 @@ void MalwareDOMDetails::HandleElement(
parent_node->children.push_back(child_url);
// Create the child node.
- ViewHostMsg_MalwareDOMDetails_Node child_node;
+ SafeBrowsingHostMsg_MalwareDOMDetails_Node child_node;
child_node.url = child_url;
child_node.tag_name = element.tagName().utf8();
child_node.parent = parent_node->url;
- resources->nodes.push_back(child_node);
+ resources->push_back(child_node);
}
} // namespace safe_browsing
diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h
index b042cba..58f7b10 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details.h
+++ b/chrome/renderer/safe_browsing/malware_dom_details.h
@@ -26,8 +26,7 @@ class WebElement;
class WebFrame;
}
-struct ViewHostMsg_MalwareDOMDetails_Params;
-struct ViewHostMsg_MalwareDOMDetails_Node;
+struct SafeBrowsingHostMsg_MalwareDOMDetails_Node;
namespace safe_browsing {
@@ -45,7 +44,8 @@ class MalwareDOMDetails : public RenderViewObserver {
// Begins extracting resource urls for the page currently loaded in
// this object's RenderView.
- void ExtractResources(ViewHostMsg_MalwareDOMDetails_Params* resources);
+ void ExtractResources(
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>* resources);
private:
// RenderViewObserver implementation.
@@ -54,9 +54,10 @@ class MalwareDOMDetails : public RenderViewObserver {
void OnGetMalwareDOMDetails();
// Handler for the various HTML elements that we extract URLs from.
- void HandleElement(const WebKit::WebElement& element,
- ViewHostMsg_MalwareDOMDetails_Node* parent_node,
- ViewHostMsg_MalwareDOMDetails_Params* resources);
+ void HandleElement(
+ const WebKit::WebElement& element,
+ SafeBrowsingHostMsg_MalwareDOMDetails_Node* parent_node,
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>* resources);
// Non-owned pointer to the view that we will extract features from.
RenderView* render_view_;
diff --git a/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc b/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc
index ea05f91..dc7d6ef 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc
+++ b/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/renderer/safe_browsing/malware_dom_details.h"
-#include "chrome/common/render_messages_params.h"
#include "base/stringprintf.h"
+#include "chrome/common/safebrowsing_messages.h"
+#include "chrome/renderer/safe_browsing/malware_dom_details.h"
#include "chrome/test/render_view_test.h"
#include "net/base/escape.h"
@@ -22,10 +22,10 @@ TEST_F(MalwareDOMDetailsTest, Everything) {
{ // An page with an internal script
std::string html = "<html><head><script></script></head></html>";
LoadHTML(html.c_str());
- ViewHostMsg_MalwareDOMDetails_Params params;
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
details.ExtractResources(&params);
- ASSERT_EQ(1u, params.nodes.size());
- EXPECT_EQ(GURL(urlprefix + html), params.nodes[0].url);
+ ASSERT_EQ(1u, params.size());
+ EXPECT_EQ(GURL(urlprefix + html), params[0].url);
}
{ // A page with 2 external scripts.
@@ -39,14 +39,14 @@ TEST_F(MalwareDOMDetailsTest, Everything) {
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- ViewHostMsg_MalwareDOMDetails_Params params;
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
details.ExtractResources(&params);
- ASSERT_EQ(3u, params.nodes.size());
- EXPECT_EQ(script1_url, params.nodes[0].url);
- EXPECT_EQ("SCRIPT", params.nodes[0].tag_name);
- EXPECT_EQ(script2_url, params.nodes[1].url);
- EXPECT_EQ("SCRIPT", params.nodes[0].tag_name);
- EXPECT_EQ(url, params.nodes[2].url);
+ ASSERT_EQ(3u, params.size());
+ EXPECT_EQ(script1_url, params[0].url);
+ EXPECT_EQ("SCRIPT", params[0].tag_name);
+ EXPECT_EQ(script2_url, params[1].url);
+ EXPECT_EQ("SCRIPT", params[0].tag_name);
+ EXPECT_EQ(url, params[2].url);
}
{ // A page with an iframe which in turn contains an iframe.
@@ -63,36 +63,36 @@ TEST_F(MalwareDOMDetailsTest, Everything) {
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- ViewHostMsg_MalwareDOMDetails_Params params;
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
details.ExtractResources(&params);
- ASSERT_EQ(5u, params.nodes.size());
+ ASSERT_EQ(5u, params.size());
- EXPECT_EQ(iframe1_url, params.nodes[0].url);
- EXPECT_EQ(url, params.nodes[0].parent);
- EXPECT_EQ(0u, params.nodes[0].children.size());
- EXPECT_EQ("IFRAME", params.nodes[0].tag_name);
+ EXPECT_EQ(iframe1_url, params[0].url);
+ EXPECT_EQ(url, params[0].parent);
+ EXPECT_EQ(0u, params[0].children.size());
+ EXPECT_EQ("IFRAME", params[0].tag_name);
- EXPECT_EQ(url, params.nodes[1].url);
- EXPECT_EQ(GURL(), params.nodes[1].parent);
- EXPECT_EQ(1u, params.nodes[1].children.size());
- EXPECT_EQ(iframe1_url, params.nodes[1].children[0]);
+ EXPECT_EQ(url, params[1].url);
+ EXPECT_EQ(GURL(), params[1].parent);
+ EXPECT_EQ(1u, params[1].children.size());
+ EXPECT_EQ(iframe1_url, params[1].children[0]);
- EXPECT_EQ(iframe2_url, params.nodes[2].url);
- EXPECT_EQ(iframe1_url, params.nodes[2].parent);
- EXPECT_EQ(0u, params.nodes[2].children.size());
- EXPECT_EQ("IFRAME", params.nodes[2].tag_name);
+ EXPECT_EQ(iframe2_url, params[2].url);
+ EXPECT_EQ(iframe1_url, params[2].parent);
+ EXPECT_EQ(0u, params[2].children.size());
+ EXPECT_EQ("IFRAME", params[2].tag_name);
// The frames are added twice, once with the correct parent and tagname
// and once with the correct children. The caller in the browser
// is responsible for merging.
- EXPECT_EQ(iframe1_url, params.nodes[3].url);
- EXPECT_EQ(GURL(), params.nodes[3].parent);
- EXPECT_EQ(1u, params.nodes[3].children.size());
- EXPECT_EQ(iframe2_url, params.nodes[3].children[0]);
-
- EXPECT_EQ(iframe2_url, params.nodes[4].url);
- EXPECT_EQ(GURL(), params.nodes[4].parent);
- EXPECT_EQ(0u, params.nodes[4].children.size());
+ EXPECT_EQ(iframe1_url, params[3].url);
+ EXPECT_EQ(GURL(), params[3].parent);
+ EXPECT_EQ(1u, params[3].children.size());
+ EXPECT_EQ(iframe2_url, params[3].children[0]);
+
+ EXPECT_EQ(iframe2_url, params[4].url);
+ EXPECT_EQ(GURL(), params[4].parent);
+ EXPECT_EQ(0u, params[4].children.size());
}
{ // >50 subframes, to verify kMaxNodes.
@@ -106,9 +106,9 @@ TEST_F(MalwareDOMDetailsTest, Everything) {
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- ViewHostMsg_MalwareDOMDetails_Params params;
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
details.ExtractResources(&params);
- ASSERT_EQ(51u, params.nodes.size());
+ ASSERT_EQ(51u, params.size());
}
{ // A page with >50 scripts, to verify kMaxNodes.
@@ -122,9 +122,9 @@ TEST_F(MalwareDOMDetailsTest, Everything) {
GURL url(urlprefix + html);
LoadHTML(html.c_str());
- ViewHostMsg_MalwareDOMDetails_Params params;
+ std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
details.ExtractResources(&params);
- ASSERT_EQ(51u, params.nodes.size());
+ ASSERT_EQ(51u, params.size());
}
}
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
index e47e422..fd7a33a 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
@@ -10,7 +10,6 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/scoped_callback_factory.h"
-#include "chrome/common/render_messages.h"
#include "chrome/common/safebrowsing_messages.h"
#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
@@ -151,7 +150,7 @@ bool PhishingClassifierDelegate::OnMessageReceived(
const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(PhishingClassifierDelegate, message)
- IPC_MESSAGE_HANDLER(ViewMsg_StartPhishingDetection,
+ IPC_MESSAGE_HANDLER(SafeBrowsingMsg_StartPhishingDetection,
OnStartPhishingDetection)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@@ -167,7 +166,7 @@ void PhishingClassifierDelegate::ClassificationDone(bool is_phishy,
return;
}
- Send(new SafeBrowsingDetectionHostMsg_DetectedPhishingSite(
+ Send(new SafeBrowsingHostMsg_DetectedPhishingSite(
routing_id(),
last_url_sent_to_classifier_,
phishy_score));
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index 241078e..d9891ca 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -61,7 +61,7 @@ class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest {
bool OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(PhishingClassifierDelegateTest, message)
- IPC_MESSAGE_HANDLER(SafeBrowsingDetectionHostMsg_DetectedPhishingSite,
+ IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_DetectedPhishingSite,
OnDetectedPhishingSite)
IPC_MESSAGE_UNHANDLED(
handled = RenderViewFakeResourcesTest::OnMessageReceived(message))
generated by cgit v1.1 at 2025-02-03 11:41:10 +0000