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

Unified Diff: trunk/src/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc

Issue 105523006: Revert 241151 "Make RenderFrameHostManager swap RenderFrameHosts..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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
Index: trunk/src/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
===================================================================
--- trunk/src/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc (revision 241158)
+++ trunk/src/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc (working copy)
@@ -48,10 +48,6 @@
namespace safe_browsing {
namespace {
-
-// The RenderFrame is routing ID 1, and the RenderView is 2.
-const int kRenderViewRoutingId = 2;
-
class MockPhishingClassifier : public PhishingClassifier {
public:
explicit MockPhishingClassifier(content::RenderView* render_view)
@@ -150,8 +146,7 @@
virtual void SetUpOnMainThread() OVERRIDE {
intercepting_filter_ = new InterceptingMessageFilter();
- content::RenderView* render_view =
- content::RenderView::FromRoutingID(kRenderViewRoutingId);
+ content::RenderView* render_view = content::RenderView::FromRoutingID(1);
GetWebContents()->GetRenderProcessHost()->AddFilter(
intercepting_filter_.get());
@@ -238,8 +233,7 @@
}
void NavigateMainFrameInternal(const GURL& url) {
- content::RenderView* render_view =
- content::RenderView::FromRoutingID(kRenderViewRoutingId);
+ content::RenderView* render_view = content::RenderView::FromRoutingID(1);
render_view->GetWebView()->mainFrame()->firstChild()->loadRequest(
blink::WebURLRequest(url));
}

Powered by Google App Engine
This is Rietveld 408576698