Remove WebContents::IsActiveEntry from Instant Extended and from WebContents.

chrome/browser/ui/search/search_tab_helper_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/search_tab_helper.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search/search.h"
@@ skipping 85 matching lines @@
   MockSearchIPCRouterDelegate delegate_;
 };
 
 TEST_F(SearchTabHelperTest, DetermineIfPageSupportsInstant_Local) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   EXPECT_CALL(*mock_delegate(), OnInstantSupportDetermined(true)).Times(0);
 
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
-  search_tab_helper->ipc_router().set_delegate(mock_delegate());
+  search_tab_helper->ipc_router().set_delegate_for_testing(mock_delegate());
   search_tab_helper->DetermineIfPageSupportsInstant();
 }
 
 TEST_F(SearchTabHelperTest, DetermineIfPageSupportsInstant_NonLocal) {
   NavigateAndCommit(GURL("chrome-search://foo/bar"));
   process()->sink().ClearMessages();
   EXPECT_CALL(*mock_delegate(), OnInstantSupportDetermined(true)).Times(1);
 
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
-  search_tab_helper->ipc_router().set_delegate(mock_delegate());
+  search_tab_helper->ipc_router().set_delegate_for_testing(mock_delegate());
   search_tab_helper->DetermineIfPageSupportsInstant();
   ASSERT_TRUE(MessageWasSent(ChromeViewMsg_DetermineIfPageSupportsInstant::ID));
 
   scoped_ptr<IPC::Message> response(
       new ChromeViewHostMsg_InstantSupportDetermined(
           web_contents()->GetRoutingID(),
-          web_contents()->GetController().GetVisibleEntry()->GetPageID(),
+          search_tab_helper->ipc_router().page_seq_no_for_testing(),
           true));
   search_tab_helper->ipc_router().OnMessageReceived(*response);
 }
 
 TEST_F(SearchTabHelperTest, PageURLDoesntBelongToInstantRenderer) {
   // Navigate to a page URL that doesn't belong to Instant renderer.
   // SearchTabHelper::DeterminerIfPageSupportsInstant() should return
   // immediately without dispatching any message to the renderer.
   NavigateAndCommit(GURL("http://www.example.com"));
   process()->sink().ClearMessages();
   EXPECT_CALL(*mock_delegate(), OnInstantSupportDetermined(false)).Times(0);
 
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
-  search_tab_helper->ipc_router().set_delegate(mock_delegate());
+  search_tab_helper->ipc_router().set_delegate_for_testing(mock_delegate());
   search_tab_helper->DetermineIfPageSupportsInstant();
   ASSERT_FALSE(MessageWasSent(
       ChromeViewMsg_DetermineIfPageSupportsInstant::ID));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatch) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   CreateSigninManager(std::string("foo@bar.com"));
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
@@ skipping 186 matching lines @@
       SearchTabHelper::FromWebContents(contents);
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
 
   // Any other web page shouldn't be redirected when provisional load fails.
   search_tab_helper->DidFailProvisionalLoad(1, base::string16(), true,
       GURL("http://www.example.com"), 1, base::string16(), NULL);
   CommitPendingLoad(controller);
   EXPECT_NE(GURL(chrome::kChromeSearchLocalNtpUrl),
                  controller->GetLastCommittedEntry()->GetURL());
 }