[New Tab Page] Change the mechanism to intercept online NTP errors

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/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 332 matching lines @@
     data.new_tab_url = std::string("https://foo.com/newtab?strk");
     data.alternate_urls.push_back("http://foo.com/alt#quux={searchTerms}");
     data.search_terms_replacement_key = "strk";
 
     TemplateURL* template_url = new TemplateURL(data);
     template_url_service->Add(template_url);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   }
 };
 
-TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailRedirectNTPToLocal) {
-  AddTab(browser(), GURL(chrome::kChromeUINewTabURL));
-  content::WebContents* contents =
-        browser()->tab_strip_model()->GetWebContentsAt(0);
-  content::NavigationController* controller = &contents->GetController();
-
-  SearchTabHelper* search_tab_helper =
-      SearchTabHelper::FromWebContents(contents);
-  ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
-
-  // A failed provisional load of a cacheable NTP should be redirected to local
-  // NTP.
-  const GURL cacheableNTPURL = chrome::GetNewTabPageURL(profile());
-  search_tab_helper->DidFailProvisionalLoad(
-      contents->GetMainFrame(), cacheableNTPURL, 1, base::string16());
-  CommitPendingLoad(controller);
-  EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl),
-                 controller->GetLastCommittedEntry()->GetURL());
-}
-
-TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailDontRedirectIfAborted) {
-  AddTab(browser(), GURL("chrome://blank"));
-  content::WebContents* contents =
-        browser()->tab_strip_model()->GetWebContentsAt(0);
-  content::NavigationController* controller = &contents->GetController();
-
-  SearchTabHelper* search_tab_helper =
-      SearchTabHelper::FromWebContents(contents);
-  ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
-
-  // A failed provisional load of a cacheable NTP should be redirected to local
-  // NTP.
-  const GURL cacheableNTPURL = chrome::GetNewTabPageURL(profile());
-  search_tab_helper->DidFailProvisionalLoad(contents->GetMainFrame(),
-                                            cacheableNTPURL,
-                                            net::ERR_ABORTED,
-                                            base::string16());
-  CommitPendingLoad(controller);
-  EXPECT_EQ(GURL("chrome://blank"),
-                 controller->GetLastCommittedEntry()->GetURL());
-}
-
-TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailDontRedirectNonNTP) {
-  AddTab(browser(), GURL(chrome::kChromeUINewTabURL));
-  content::WebContents* contents =
-        browser()->tab_strip_model()->GetWebContentsAt(0);
-  content::NavigationController* controller = &contents->GetController();
-
-  SearchTabHelper* search_tab_helper =
-      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(contents->GetMainFrame(),
-                                            GURL("http://www.example.com"),
-                                            1,
-                                            base::string16());
-  CommitPendingLoad(controller);
-  EXPECT_NE(GURL(chrome::kChromeSearchLocalNtpUrl),
-                 controller->GetLastCommittedEntry()->GetURL());
-}
-
 class SearchTabHelperPrerenderTest : public InstantUnitTestBase {
  public:
   ~SearchTabHelperPrerenderTest() override {}
 
  protected:
   void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch",
         "Group1 espv:89 prefetch_results:1 "
         "prerender_instant_url_on_omnibox_focus:1"));
@@ skipping 46 matching lines @@
 }
 
 TEST_F(SearchTabHelperPrerenderTest,
     OnTabActivatedNoPrerenderIfOmniboxBlurred) {
   SearchTabHelperPrerenderTest::omnibox_has_focus_ = false;
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   search_tab_helper->OnTabActivated();
   ASSERT_FALSE(IsInstantURLMarkedForPrerendering());
 }