Remove obsolete parts of InstantExtended tests

chrome/browser/ui/search/instant_extended_interactive_uitest.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 <stdint.h>
 
 #include <sstream>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 119 matching lines @@
 };
 }  // namespace
 
 class InstantExtendedTest : public InProcessBrowserTest,
                             public InstantTestBase {
  public:
   InstantExtendedTest()
       : on_most_visited_change_calls_(0),
         most_visited_items_count_(0),
         first_most_visited_item_id_(0),
-        on_native_suggestions_calls_(0),
-        on_change_calls_(0),
         submit_count_(0),
-        on_esc_key_press_event_calls_(0),
         on_focus_changed_calls_(0),
         is_focused_(false) {}
 
  protected:
   void SetUpInProcessBrowserTestFixture() override {
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url =
         https_test_server().GetURL("/instant_extended.html?strk=1&");
     GURL ntp_url =
         https_test_server().GetURL("/instant_extended_ntp.html?strk=1&");
@@ skipping 11 matching lines @@
     return histogram->SnapshotSamples()->TotalCount();
   }
 
   bool UpdateSearchState(content::WebContents* contents) WARN_UNUSED_RESULT {
     return GetIntFromJS(contents, "onMostVisitedChangedCalls",
                         &on_most_visited_change_calls_) &&
            GetIntFromJS(contents, "mostVisitedItemsCount",
                         &most_visited_items_count_) &&
            GetIntFromJS(contents, "firstMostVisitedItemId",
                         &first_most_visited_item_id_) &&
-           GetIntFromJS(contents, "onNativeSuggestionsCalls",
-                        &on_native_suggestions_calls_) &&
-           GetIntFromJS(contents, "onChangeCalls",
-                        &on_change_calls_) &&
            GetIntFromJS(contents, "submitCount",
                         &submit_count_) &&
            GetStringFromJS(contents, "apiHandle.value",
                            &query_value_) &&
-           GetIntFromJS(contents, "onEscKeyPressedCalls",
-                        &on_esc_key_press_event_calls_) &&
            GetIntFromJS(contents, "onFocusChangedCalls",
                        &on_focus_changed_calls_) &&
            GetBoolFromJS(contents, "isFocused",
                          &is_focused_) &&
            GetStringFromJS(contents, "prefetchQuery", &prefetch_query_value_);
-
   }
 
   TemplateURL* GetDefaultSearchProviderTemplateURL() {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     if (template_url_service)
       return template_url_service->GetDefaultSearchProvider();
     return NULL;
   }
 
@@ skipping 30 matching lines @@
   }
 
   int CountSearchProviderSuggestions() {
     return omnibox()->model()->autocomplete_controller()->search_provider()->
         matches().size();
   }
 
   int on_most_visited_change_calls_;
   int most_visited_items_count_;
   int first_most_visited_item_id_;
-  int on_native_suggestions_calls_;
-  int on_change_calls_;
   int submit_count_;
-  int on_esc_key_press_event_calls_;
   std::string query_value_;
   int on_focus_changed_calls_;
   bool is_focused_;
   std::string prefetch_query_value_;
 };
 
 class InstantExtendedPrefetchTest : public InstantExtendedTest {
  public:
   InstantExtendedPrefetchTest()
       : factory_(new net::URLFetcherImplFactory()),
@@ skipping 317 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(1, on_most_visited_change_calls_);
 
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   // Set the text and press enter to navigate from NTP.
   SetOmniboxText("Pen");
   PressEnterAndWaitForNavigation();
-  EXPECT_EQ(ASCIIToUTF16("Pen"), omnibox()->GetText());
   observer.Wait();
 
   // Navigate back to NTP.
   content::WindowedNotificationObserver back_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(active_tab->GetController().CanGoBack());
   active_tab->GetController().GoBack();
   back_observer.Wait();
@@ skipping 149 matching lines @@
   stream << "link.href = \"" << result_url.spec() << "\";";
   stream << "document.body.appendChild(link);";
   stream << "link.click();";
   EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
 
   content::WaitForLoadStop(contents);
   std::string expected_title =
       "Referrer is " + instant_url().GetWithEmptyPath().spec();
   EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
 }