| Index: chrome/renderer/safe_browsing/malware_dom_details.cc
|
| diff --git a/chrome/renderer/safe_browsing/malware_dom_details.cc b/chrome/renderer/safe_browsing/malware_dom_details.cc
|
| index 7b6deed9d7b6fa2e456714d2fdfe09e23cd2d491..605ab69f7acf3e27ad641eb55d2824e6ba76df11 100644
|
| --- a/chrome/renderer/safe_browsing/malware_dom_details.cc
|
| +++ b/chrome/renderer/safe_browsing/malware_dom_details.cc
|
| @@ -54,16 +54,16 @@ void MalwareDOMDetails::OnGetMalwareDOMDetails() {
|
|
|
| void MalwareDOMDetails::ExtractResources(
|
| std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>* resources) {
|
| - WebKit::WebView* web_view = render_view()->GetWebView();
|
| + blink::WebView* web_view = render_view()->GetWebView();
|
| if (!web_view) {
|
| NOTREACHED();
|
| return;
|
| }
|
| - WebKit::WebFrame* frame = web_view->mainFrame();
|
| + blink::WebFrame* frame = web_view->mainFrame();
|
| for (; frame; frame = frame->traverseNext(false /* don't wrap */)) {
|
| DCHECK(frame);
|
| SafeBrowsingHostMsg_MalwareDOMDetails_Node details_node;
|
| - WebKit::WebDocument document = frame->document();
|
| + blink::WebDocument document = frame->document();
|
| details_node.url = GURL(document.url());
|
| if (document.isNull()) {
|
| // Nothing in this frame, move on to the next one.
|
| @@ -71,13 +71,13 @@ void MalwareDOMDetails::ExtractResources(
|
| continue;
|
| }
|
|
|
| - WebKit::WebNodeCollection elements = document.all();
|
| - WebKit::WebNode cur_node = elements.firstItem();
|
| + blink::WebNodeCollection elements = document.all();
|
| + blink::WebNode cur_node = elements.firstItem();
|
| for (; !cur_node.isNull(); cur_node = elements.nextItem()) {
|
| if (!cur_node.isElementNode()) {
|
| continue;
|
| }
|
| - WebKit::WebElement element = cur_node.to<WebKit::WebElement>();
|
| + blink::WebElement element = cur_node.to<blink::WebElement>();
|
| if (element.hasTagName("iframe") || element.hasTagName("frame") ||
|
| element.hasTagName("embed") || element.hasTagName("script")) {
|
| HandleElement(element, &details_node, resources);
|
| @@ -94,7 +94,7 @@ void MalwareDOMDetails::ExtractResources(
|
| }
|
|
|
| void MalwareDOMDetails::HandleElement(
|
| - const WebKit::WebElement& element,
|
| + const blink::WebElement& element,
|
| SafeBrowsingHostMsg_MalwareDOMDetails_Node* parent_node,
|
| std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>* resources) {
|
| if (!element.hasAttribute("src")) {
|
| @@ -102,7 +102,7 @@ void MalwareDOMDetails::HandleElement(
|
| }
|
|
|
| // Retrieve the link and resolve the link in case it's relative.
|
| - WebKit::WebURL full_url = element.document().completeURL(
|
| + blink::WebURL full_url = element.document().completeURL(
|
| element.getAttribute("src"));
|
|
|
| const GURL& child_url = GURL(full_url);
|
|
|