Network error interstitial update - add suggestions list

chrome/browser/errorpage_browsertest.cc

 // Copyright (c) 2012 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 <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 110 matching lines @@
       browser->tab_strip_model()->GetActiveWebContents(), command, &result));
   return result;
 }
 
 // Checks that the local error page is being displayed, without remotely
 // retrieved navigation corrections, and with the specified error code.
 void ExpectDisplayingLocalErrorPage(Browser* browser, net::Error error_code) {
   EXPECT_TRUE(IsDisplayingNetError(browser, error_code));
 
   // Expand the help box so innerText will include text below the fold.
   ToggleHelpBox(browser);

[mmenke, 2016/02/18 19:51:18]

Not needed any more, since the next function doesn't use it?

[edwardjung, 2016/02/19 18:18:21]

Done.

 
   // Locally generated error pages should not have navigation corrections.
-  EXPECT_FALSE(IsDisplayingText(browser, "http://correction1/"));
-  EXPECT_FALSE(IsDisplayingText(browser, "http://correction2/"));
+  EXPECT_FALSE(IsDisplayingText(browser, "http://mock.http/title2.html"));
 
-  // Locally generated error pages should not have a populated search box.
-  bool search_box_populated = false;
-  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-      browser->tab_strip_model()->GetActiveWebContents(),
-      "var searchText = document.getElementById('search-box').value;"
-          "domAutomationController.send(searchText == 'search query');",
-      &search_box_populated));
-  EXPECT_FALSE(search_box_populated);
+  // Locally generated error pages should not have a link with search terms.
+  EXPECT_FALSE(IsDisplayingText(browser, "search query"));
 }
 
 // Checks that an error page with information retrieved from the navigation
 // correction service is being displayed, with the specified specified error
 // code.
 void ExpectDisplayingNavigationCorrections(Browser* browser,
                                            net::Error error_code) {
   EXPECT_TRUE(IsDisplayingNetError(browser, error_code));
 
-  // Expand the help box so innerText will include text below the fold.
-  ToggleHelpBox(browser);
+  // Check that the mock navigation corrections are displayed.
+  EXPECT_TRUE(IsDisplayingText(browser, "http://mock.http/title2.html"));
 
-  // Check that the mock navigation corrections are displayed.
-  EXPECT_TRUE(IsDisplayingText(browser, "http://correction1/"));
-  EXPECT_TRUE(IsDisplayingText(browser, "http://correction2/"));
-
-  // Check that the search box is populated correctly.
-  bool search_box_populated = false;
-  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-      browser->tab_strip_model()->GetActiveWebContents(),
-      "var searchText = document.getElementById('search-box').value;"
-          "domAutomationController.send(searchText == 'search query');",
-      &search_box_populated));
-  EXPECT_TRUE(search_box_populated);
+  // Check that the search terms are displayed as a link.
+  EXPECT_TRUE(IsDisplayingText(browser, "search query"));
 
   // The diagnostics button isn't displayed when corrections were
   // retrieved from a remote server.
   EXPECT_FALSE(IsDisplayingDiagnosticsButton(browser));
-
-  // Close help box again, to return page to original state.
-  ToggleHelpBox(browser);
 }
 
 std::string GetShowSavedButtonLabel() {
   return l10n_util::GetStringUTF8(IDS_ERRORPAGES_BUTTON_SHOW_SAVED_COPY);
 }
 
 void AddInterceptorForURL(
     const GURL& url,
     scoped_ptr<net::URLRequestInterceptor> handler) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 480 matching lines @@
   GoBackAndWaitForTitle("Title Of More Awesomeness", 1);
 
   GoForwardAndWaitForNavigations(2);
   ExpectDisplayingNavigationCorrections(browser(), net::ERR_NAME_NOT_RESOLVED);
   EXPECT_EQ(3, link_doctor_interceptor()->num_requests());
 
   GoForwardAndWaitForTitle("Title Of Awesomeness", 1);
   EXPECT_EQ(3, link_doctor_interceptor()->num_requests());
 }
 
-// Test that the search button on a DNS error page works.
+// Test that the search link on a DNS error page works.
 IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_DoSearch) {
   // The first navigation should fail, and the second one should be the error
   // page.
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
        browser(), GetDnsErrorURL(), 2);
   ExpectDisplayingNavigationCorrections(browser(), net::ERR_NAME_NOT_RESOLVED);
   EXPECT_EQ(1, link_doctor_interceptor()->num_requests());
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Do a search and make sure the browser ends up at the right page.
   content::TestNavigationObserver nav_observer(web_contents, 1);
   content::TitleWatcher title_watcher(
       web_contents,
       base::ASCIIToUTF16("Title Of More Awesomeness"));
   // Can't use content::ExecuteScript because it waits for scripts to send
   // notification that they've run, and scripts that trigger a navigation may
   // not send that notification.
   web_contents->GetMainFrame()->ExecuteJavaScriptForTests(
-      base::ASCIIToUTF16("document.getElementById('search-button').click();"));
+      base::ASCIIToUTF16("document.getElementById('search-link').click();"));
   nav_observer.Wait();
   EXPECT_EQ(base::ASCIIToUTF16("Title Of More Awesomeness"),
             title_watcher.WaitAndGetTitle());
 
   // There should have been another Link Doctor request, for tracking purposes.
   // Have to wait for it, since the search page does not depend on having
   // sent the tracking request.
   link_doctor_interceptor()->WaitForRequests(2);
   EXPECT_EQ(2, link_doctor_interceptor()->num_requests());
 
@@ skipping 772 matching lines @@
 IN_PROC_BROWSER_TEST_F(ErrorPageForIDNTest, IDN) {
   // ERR_UNSAFE_PORT will not trigger navigation corrections.
   ui_test_utils::NavigateToURL(
       browser(),
       URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT,
                                                      kHostname));
   EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode));
 }
 
 }  // namespace