Remove WebContents::GetRoutingID().

chrome/browser/ui/search/instant_tab_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/search/instant_tab.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 63 matching lines @@
   page.reset(new InstantTab(&delegate, web_contents()));
   EXPECT_FALSE(search_tab()->SupportsInstant());
   page->Init();
   NavigateAndCommit(GURL("chrome-search://foo/bar"));
   process()->sink().ClearMessages();
   SearchTabHelper::FromWebContents(web_contents())->
       DetermineIfPageSupportsInstant();
   const IPC::Message* message = process()->sink().GetFirstMessageMatching(
       ChromeViewMsg_DetermineIfPageSupportsInstant::ID);
   ASSERT_TRUE(message != NULL);
-  EXPECT_EQ(web_contents()->GetRoutingID(), message->routing_id());
+  EXPECT_EQ(web_contents()->GetRenderViewHost()->GetRoutingID(),
+            message->routing_id());
 }
 
 TEST_F(InstantTabTest, PageURLDoesntBelongToInstantRenderer) {
   page.reset(new InstantTab(&delegate, web_contents()));
   EXPECT_FALSE(search_tab()->SupportsInstant());
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   page->Init();
 
   // Navigate to a page URL that doesn't belong to Instant renderer.
   // SearchTabHelper::DeterminerIfPageSupportsInstant() should return
@@ skipping 16 matching lines @@
   page.reset(new InstantTab(&delegate, web_contents()));
   EXPECT_FALSE(search_tab()->SupportsInstant());
   page->Init();
   NavigateAndCommit(GURL("chrome-search://foo/bar"));
   process()->sink().ClearMessages();
   SearchTabHelper::FromWebContents(web_contents())->
       DetermineIfPageSupportsInstant();
   const IPC::Message* message = process()->sink().GetFirstMessageMatching(
       ChromeViewMsg_DetermineIfPageSupportsInstant::ID);
   ASSERT_TRUE(message != NULL);
-  EXPECT_EQ(web_contents()->GetRoutingID(), message->routing_id());
+  EXPECT_EQ(web_contents()->GetRenderViewHost()->GetRoutingID(),
+            message->routing_id());
 
   EXPECT_CALL(delegate, InstantSupportDetermined(web_contents(), true));
 
   // Assume the page supports instant. Invoke the message reply handler to make
   // sure the InstantTab is notified about the instant support state.
   const content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   EXPECT_TRUE(entry);
   SearchTabHelper::FromWebContents(web_contents())->InstantSupportChanged(true);
   EXPECT_TRUE(search_tab()->SupportsInstant());
 }