Enable InstantExtendedPrefetchTests

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 <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 257 matching lines @@
   std::string query_value_;
   int on_focus_changed_calls_;
   bool is_focused_;
   int on_toggle_voice_search_calls_;
   std::string prefetch_query_value_;
 };
 
 class InstantExtendedPrefetchTest : public InstantExtendedTest {
  public:
   InstantExtendedPrefetchTest()
-      : factory_(new net::FakeURLFetcherFactory(
-            net::URLFetcherImpl::factory())) {
+      : factory_(new net::URLFetcherImplFactory()),
+        fake_factory_(new net::FakeURLFetcherFactory(factory_.get())) {
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     chrome::EnableInstantExtendedAPIForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url, true);
-    factory_->SetFakeResponse(GoogleURLTracker::kSearchDomainCheckURL,
-                              ".google.com", true);
   }
 
-  scoped_ptr<net::FakeURLFetcherFactory> factory_;
+  net::FakeURLFetcherFactory* fake_factory() { return fake_factory_.get(); }
+
+ private:
+  // Used to instantiate FakeURLFetcherFactory.
+  scoped_ptr<net::URLFetcherImplFactory> factory_;
+
+  // Used to mock default search provider suggest response.
+  scoped_ptr<net::FakeURLFetcherFactory> fake_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantExtendedPrefetchTest);
 };
 
 class InstantExtendedNetworkTest : public InstantExtendedTest {
  protected:
   virtual void SetUpOnMainThread() OVERRIDE {
     disable_for_test_.reset(new net::NetworkChangeNotifier::DisableForTest);
     fake_network_change_notifier_.reset(new FakeNetworkChangeNotifier);
     InstantExtendedTest::SetUpOnMainThread();
@@ skipping 1372 matching lines @@
       content::NOTIFICATION_LOAD_STOP,
       content::Source<content::NavigationController>(
           &ntp_contents->GetController()));
   service->SetDefaultSearchProvider(template_url);
   observer.Wait();
 
   // Make sure the URL remains the same.
   EXPECT_EQ(ntp_url, ntp_contents->GetURL());
 }
 
-// TODO(kmadhusu): Fix this flaky test. crbug.com/280247.
-IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest,
-                       DISABLED_SetPrefetchQuery) {
+IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest, SetPrefetchQuery) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantNTPSupport();
 
   content::WindowedNotificationObserver new_tab_observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
   new_tab_observer.Wait();
 
   omnibox()->model()->autocomplete_controller()->search_provider()->
       kMinimumTimeBetweenSuggestQueriesMs = 0;
 
   // Set the fake response for suggest request. Response has prefetch details.
   // Ensure that the page received the prefetch query.
-  factory_->SetFakeResponse(
+  fake_factory()->SetFakeResponse(
       instant_url().spec() + "#q=pupp",
       "[\"pupp\",[\"puppy\", \"puppies\"],[],[],"
       "{\"google:clientdata\":{\"phi\": 0},"
           "\"google:suggesttype\":[\"QUERY\", \"QUERY\"],"
           "\"google:suggestrelevance\":[1400, 9]}]",
       true);
 
   SetOmniboxText("pupp");
   while (!omnibox()->model()->autocomplete_controller()->done()) {
     content::WindowedNotificationObserver ready_observer(
         chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
         content::Source<AutocompleteController>(
             omnibox()->model()->autocomplete_controller()));
     ready_observer.Wait();
   }
 
   ASSERT_EQ(3, CountSearchProviderSuggestions());
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_TRUE(SearchProvider::ShouldPrefetch(*(
       omnibox()->model()->result().default_match())));
   ASSERT_EQ("puppy", prefetch_query_value_);
 }
 
-// TODO(kmadhusu): Fix this flaky test. crbug.com/280247.
-IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest,
-                       DISABLED_ClearPrefetchedResults) {
+IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest, ClearPrefetchedResults) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantNTPSupport();
 
   content::WindowedNotificationObserver new_tab_observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
   new_tab_observer.Wait();
 
   omnibox()->model()->autocomplete_controller()->search_provider()->
       kMinimumTimeBetweenSuggestQueriesMs = 0;
 
   // Set the fake response for suggest request. Response has no prefetch
   // details. Ensure that the page received a blank query to clear the
   // prefetched results.
-  factory_->SetFakeResponse(
+  fake_factory()->SetFakeResponse(
       instant_url().spec() + "#q=dogs",
       "[\"dogs\",[\"https://dogs.com\"],[],[],"
           "{\"google:suggesttype\":[\"NAVIGATION\"],"
           "\"google:suggestrelevance\":[2]}]",
       true);
 
   SetOmniboxText("dogs");
   while (!omnibox()->model()->autocomplete_controller()->done()) {
     content::WindowedNotificationObserver ready_observer(
         chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
         content::Source<AutocompleteController>(
             omnibox()->model()->autocomplete_controller()));
     ready_observer.Wait();
   }
 
   ASSERT_EQ(2, CountSearchProviderSuggestions());
   ASSERT_FALSE(SearchProvider::ShouldPrefetch(*(
       omnibox()->model()->result().default_match())));
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ("", prefetch_query_value_);
 }