Small cleanup in SearchTabHelper

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 32 matching lines @@
 }  // namespace
 
 class InstantTabTest : public ChromeRenderViewHostTestHarness {
  public:
   void SetUp() override;
 
   SearchTabHelper* search_tab() {
     return SearchTabHelper::FromWebContents(web_contents());
   }
 
+  bool SupportsInstant() {
+    return search_tab()->model()->instant_support() == INSTANT_SUPPORT_YES;
+  }
+
   std::unique_ptr<InstantTab> page;
   FakePageDelegate delegate;
 };
 
 void InstantTabTest::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
   SearchTabHelper::CreateForWebContents(web_contents());
 }
 
 TEST_F(InstantTabTest, DetermineIfPageSupportsInstant_Local) {
   page.reset(new InstantTab(&delegate, web_contents()));
-  EXPECT_FALSE(search_tab()->SupportsInstant());
+  EXPECT_FALSE(SupportsInstant());
   page->Init();
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   EXPECT_CALL(delegate, InstantSupportDetermined(web_contents(), true));
-  SearchTabHelper::FromWebContents(web_contents())->
-      DetermineIfPageSupportsInstant();
-  EXPECT_TRUE(search_tab()->SupportsInstant());
+  search_tab()->DetermineIfPageSupportsInstant();
+  EXPECT_TRUE(SupportsInstant());
 }
 
 TEST_F(InstantTabTest, DetermineIfPageSupportsInstant_NonLocal) {
   page.reset(new InstantTab(&delegate, web_contents()));
-  EXPECT_FALSE(search_tab()->SupportsInstant());
+  EXPECT_FALSE(SupportsInstant());
   page->Init();
   NavigateAndCommit(GURL("chrome-search://foo/bar"));
   process()->sink().ClearMessages();
-  SearchTabHelper::FromWebContents(web_contents())->
-      DetermineIfPageSupportsInstant();
+  search_tab()->DetermineIfPageSupportsInstant();
   const IPC::Message* message = process()->sink().GetFirstMessageMatching(
       ChromeViewMsg_DetermineIfPageSupportsInstant::ID);
   ASSERT_TRUE(message != NULL);
   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());
+  EXPECT_FALSE(SupportsInstant());
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   page->Init();
 
   // 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(delegate, InstantSupportDetermined(web_contents(), false));
 
-  SearchTabHelper::FromWebContents(web_contents())->
-      DetermineIfPageSupportsInstant();
+  search_tab()->DetermineIfPageSupportsInstant();
   const IPC::Message* message = process()->sink().GetFirstMessageMatching(
       ChromeViewMsg_DetermineIfPageSupportsInstant::ID);
   ASSERT_TRUE(message == NULL);
-  EXPECT_FALSE(search_tab()->SupportsInstant());
+  EXPECT_FALSE(SupportsInstant());
 }
 
 // Test to verify that ChromeViewMsg_DetermineIfPageSupportsInstant message
 // reply handler updates the instant support state in InstantTab.
 TEST_F(InstantTabTest, PageSupportsInstant) {
   page.reset(new InstantTab(&delegate, web_contents()));
-  EXPECT_FALSE(search_tab()->SupportsInstant());
+  EXPECT_FALSE(SupportsInstant());
   page->Init();
   NavigateAndCommit(GURL("chrome-search://foo/bar"));
   process()->sink().ClearMessages();
-  SearchTabHelper::FromWebContents(web_contents())->
-      DetermineIfPageSupportsInstant();
+  search_tab()->DetermineIfPageSupportsInstant();
   const IPC::Message* message = process()->sink().GetFirstMessageMatching(
       ChromeViewMsg_DetermineIfPageSupportsInstant::ID);
   ASSERT_TRUE(message != NULL);
   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());
+  search_tab()->InstantSupportChanged(true);
+  EXPECT_TRUE(SupportsInstant());
 }