Fix Android unit_tests failures with PlzNavigate.

chrome/browser/net/net_error_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/net/net_error_tab_helper.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "components/error_page/common/net_error_info.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 151 matching lines @@
       content::RenderFrameHostTester::For(main_rfh())->
           SimulateNavigationCommit(url);
     } else {
       content::RenderFrameHostTester::For(main_rfh())->
           SimulateNavigationError(url, net::ERR_TIMED_OUT);
       content::RenderFrameHostTester::For(main_rfh())->
           SimulateNavigationErrorPageCommit();
     }
   }
 
+#if BUILDFLAG(ANDROID_JAVA_UI)
+  void NoDownloadPageLaterForNonHttpSchemes(const char* url_string,
+                                            bool succeeded) {
+    GURL url(url_string);
+    LoadURL(url, succeeded);
+    tab_helper()->DownloadPageLater();
+    EXPECT_EQ(0, tab_helper()->times_download_page_later_invoked());
+  }
+#endif
+
   bool probe_running() { return tab_helper_->mock_probe_running(); }
   DnsProbeStatus last_status_sent() { return tab_helper_->last_status_sent(); }
   int sent_count() { return tab_helper_->mock_sent_count(); }
 
   TestNetErrorTabHelper* tab_helper() { return tab_helper_.get(); }
 
  private:
   content::RenderFrameHost* subframe_;
   std::unique_ptr<TestNetErrorTabHelper> tab_helper_;
   GURL bogus_url_;
@@ skipping 190 matching lines @@
 
 TEST_F(NetErrorTabHelperTest, NoDownloadPageLaterOnNonErrorPage) {
   GURL url("http://somewhere:123/");
   LoadURL(url, true /*succeeded*/);
   tab_helper()->DownloadPageLater();
   EXPECT_EQ(0, tab_helper()->times_download_page_later_invoked());
 }
 
 // Makes sure that "Download page later" isn't run on URLs with non-HTTP/HTTPS
 // schemes.
-TEST_F(NetErrorTabHelperTest, NoDownloadPageLaterForNonHttpSchemes) {
-  const char* kUrls[] = {
-    "file:///blah/blah",
-    "chrome://blah/",
-    "about:blank",
-  };
+// NOTE: the test harness code in this file and in TestRendererHost don't always
+// deal with pending RFH correctly. This works because most tests only load
+// once. So workaround it by puting each test case in a separate test.

[arthursonzogni, 2016/12/15 16:32:39]

Nit: s/don't/doesn't
Nit: s/puting/putting

+TEST_F(NetErrorTabHelperTest, NoDownloadPageLaterForNonHttpSchemes1) {
+  NoDownloadPageLaterForNonHttpSchemes("file:///blah/blah", false);
+}
 
-  for (const char* url_string : kUrls) {
-    GURL url(url_string);
-    LoadURL(url, false /*succeeded*/);
-    tab_helper()->DownloadPageLater();
-    EXPECT_EQ(0, tab_helper()->times_download_page_later_invoked());
-  }
+TEST_F(NetErrorTabHelperTest, NoDownloadPageLaterForNonHttpSchemes2) {
+  NoDownloadPageLaterForNonHttpSchemes("chrome://blah/", false);
 }
+
+TEST_F(NetErrorTabHelperTest, NoDownloadPageLaterForNonHttpSchemes3) {
+  // about:blank always succeeds, and the test harness won't handle URLs that
+  // don't go to the network failing.
+  NoDownloadPageLaterForNonHttpSchemes("about:blank", true);
+}
+
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)