Surface button for loading stale cache copy on net error page.

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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 236 matching lines @@
   void GoForwardAndWaitForNavigations(int num_navigations) {
     NavigateHistory(num_navigations, HISTORY_NAVIGATE_FORWARD);
   }
 
   // Confirms that the javascript variable indicating whether or not we have
   // a stale copy in the cache has been set to |expected|.
   bool ProbeStaleCopyValue(bool expected) {
     const char* js_cache_probe =
         "try {\n"
         "    domAutomationController.send(\n"
-        "        templateData.staleCopyInCache ? 'yes' : 'no');\n"
+        "        'staleCopyInCache' in templateData ? 'yes' : 'no');\n"
         "} catch (e) {\n"
         "    domAutomationController.send(e.message);\n"
         "}\n";
 
     std::string result;
     bool ret =
         content::ExecuteScriptAndExtractString(
             browser()->tab_strip_model()->GetActiveWebContents(),
             js_cache_probe,
             &result);
     EXPECT_TRUE(ret);
     if (!ret)
       return false;
     EXPECT_EQ(expected ? "yes" : "no", result);
     return ((expected ? "yes" : "no") == result);
   }
 
   testing::AssertionResult ReloadStaleCopyFromCache() {

[mmenke, 2014/04/11 19:42:32]

Now that we have a button, should "click" it with a script instead.

[Randy Smith (Not in Mondays), 2014/04/14 22:02:13]

Done.

     const char* js_reload_script =
         "try {\n"
         "    errorCacheLoad.reloadStaleInstance();\n"
         "    domAutomationController.send('success');\n"
         "} catch (e) {\n"
         "    domAutomationController.send(e.message);\n"
         "}\n";
 
     std::string result;
     bool ret = content::ExecuteScriptAndExtractString(
@@ skipping 387 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter =
       browser()->profile()->GetRequestContext();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&InterceptNetworkTransactions, url_request_context_getter,
                  net::ERR_FAILED));
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       // With no navigation corrections to load, there's only one navigation.
       browser(), test_url, 1);
   EXPECT_TRUE(ProbeStaleCopyValue(true));

[mmenke, 2014/04/11 19:42:32]

Suggest also checking the button's visibility.  Should also check that it's not
visible (Same for the other test)

[Randy Smith (Not in Mondays), 2014/04/14 22:02:13]

Done.

   EXPECT_NE(base::ASCIIToUTF16("Nocache Test Page"),
             browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
 
   // Confirm that loading the stale copy from the cache works.
   content::TestNavigationObserver same_tab_observer(
       browser()->tab_strip_model()->GetActiveWebContents(), 1);
   ASSERT_TRUE(ReloadStaleCopyFromCache());
   same_tab_observer.Wait();
   EXPECT_EQ(base::ASCIIToUTF16("Nocache Test Page"),
             browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
@@ skipping 179 matching lines @@
             browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
 
   // Clear the cache and reload the same URL; confirm the error page is told
   // that there is no cached copy.
   BrowsingDataRemover* remover =
       BrowsingDataRemover::CreateForUnboundedRange(browser()->profile());
   remover->Remove(BrowsingDataRemover::REMOVE_CACHE,
                   BrowsingDataHelper::UNPROTECTED_WEB);
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(), test_url, 2);
   ProbeStaleCopyValue(false);

[mmenke, 2014/04/11 19:42:32]

Should also check that the button's hidden.

[Randy Smith (Not in Mondays), 2014/04/14 22:02:13]

Done.

 }
 
 // A test fixture that simulates failing requests for an IDN domain name.
 class ErrorPageForIDNTest : public InProcessBrowserTest {
  public:
   // Target hostname in different forms.
   static const char kHostname[];
   static const char kHostnameJSUnicode[];
 
   // InProcessBrowserTest:
@@ skipping 37 matching lines @@
       browser(),
       URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT,
                                                      kHostname),
       1);
 
   ToggleHelpBox(browser());
   EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode));
 }
 
 }  // namespace