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

Unified Diff: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 years, 10 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
Index: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 55dc35f2df0d56555d1b47db662c7da1eb10d222..de140f424c9673518db5080862d33ca50a73b541 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -281,7 +281,7 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness {
resource.callback = base::Bind(&EmptyUrlCheckCallback);
resource.render_process_host_id = contents()->GetRenderProcessHost()->
GetID();
- resource.render_view_id = contents()->GetRenderViewHost()->routing_id();
+ resource.render_view_id = contents()->GetRenderViewHost()->GetRoutingID();
csd_host_->OnSafeBrowsingHit(resource);
resource.callback.Reset();
ASSERT_TRUE(csd_host_->DidShowSBInterstitial());
@@ -427,7 +427,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneShowInterstitial) {
resource.threat_type);
EXPECT_EQ(contents()->GetRenderProcessHost()->GetID(),
resource.render_process_host_id);
- EXPECT_EQ(contents()->GetRenderViewHost()->routing_id(),
+ EXPECT_EQ(contents()->GetRenderViewHost()->GetRoutingID(),
resource.render_view_id);
// Make sure the client object will be deleted.
@@ -519,7 +519,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneMultiplePings) {
resource.threat_type);
EXPECT_EQ(contents()->GetRenderProcessHost()->GetID(),
resource.render_process_host_id);
- EXPECT_EQ(contents()->GetRenderViewHost()->routing_id(),
+ EXPECT_EQ(contents()->GetRenderViewHost()->GetRoutingID(),
resource.render_view_id);
// Make sure the client object will be deleted.
@@ -613,7 +613,7 @@ TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
Tuple1<GURL> actual_url;
SafeBrowsingMsg_StartPhishingDetection::Read(msg, &actual_url);
EXPECT_EQ(url, actual_url.a);
- EXPECT_EQ(rvh()->routing_id(), msg->routing_id());
+ EXPECT_EQ(rvh()->GetRoutingID(), msg->routing_id());
process()->sink().ClearMessages();
// Now try an in-page navigation. This should not trigger an IPC.
@@ -642,7 +642,7 @@ TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
ASSERT_TRUE(msg);
SafeBrowsingMsg_StartPhishingDetection::Read(msg, &actual_url);
EXPECT_EQ(url, actual_url.a);
- EXPECT_EQ(rvh()->routing_id(), msg->routing_id());
+ EXPECT_EQ(rvh()->GetRoutingID(), msg->routing_id());
process()->sink().ClearMessages();
// Navigate to a new host, which should cause another IPC.
@@ -656,7 +656,7 @@ TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
ASSERT_TRUE(msg);
SafeBrowsingMsg_StartPhishingDetection::Read(msg, &actual_url);
EXPECT_EQ(url, actual_url.a);
- EXPECT_EQ(rvh()->routing_id(), msg->routing_id());
+ EXPECT_EQ(rvh()->GetRoutingID(), msg->routing_id());
process()->sink().ClearMessages();
// If the mime type is not one that we support, no IPC should be triggered.
@@ -713,7 +713,7 @@ TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
ASSERT_TRUE(msg);
SafeBrowsingMsg_StartPhishingDetection::Read(msg, &actual_url);
EXPECT_EQ(url, actual_url.a);
- EXPECT_EQ(rvh()->routing_id(), msg->routing_id());
+ EXPECT_EQ(rvh()->GetRoutingID(), msg->routing_id());
process()->sink().ClearMessages();
// If the url isn't in the cache and we are over the reporting limit, we
« no previous file with comments | « chrome/browser/safe_browsing/client_side_detection_host.cc ('k') | chrome/browser/safe_browsing/malware_details.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698