chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc - Issue 6713084: Move the rest of the renderer->browser messages that belong in content. Also do a bunch of cleanup:

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

Issue 6713084: Move the rest of the renderer->browser messages that belong in content. Also do a bunch of cleanup: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 9 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/renderer/safe_browsing/malware_dom_details.cc ('k') | chrome/renderer/safe_browsing/phishing_classifier_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc

===================================================================

--- chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc (revision 79188)

+++ chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc (working copy)

@@ -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 "base/stringprintf.h"

+#include "chrome/common/safebrowsing_messages.h"

#include "chrome/renderer/safe_browsing/malware_dom_details.h"

-#include "chrome/common/render_messages_params.h"

-#include "base/stringprintf.h"

#include "chrome/test/render_view_test.h"

#include "net/base/escape.h"

@@ -22,10 +22,10 @@

{ // 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 @@

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 @@

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(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.nodes[4].url);

- EXPECT_EQ(GURL(), params.nodes[4].parent);

- EXPECT_EQ(0u, params.nodes[4].children.size());

+ 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 @@

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 @@

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());

}