Fix DevToolsProtocolTest.DoubleCrash with PlzNavigate on Android.

content/browser/devtools/protocol/devtools_protocol_browsertest.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 <stddef.h>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 121 matching lines @@
 }
 
 class DevToolsProtocolTest : public ContentBrowserTest,
                              public DevToolsAgentHostClient,
                              public WebContentsDelegate {
  public:
   DevToolsProtocolTest()
       : last_sent_id_(0),
         waiting_for_command_result_id_(0),
         in_dispatch_(false),
-        last_shown_certificate_(nullptr),
-        ok_cert_(nullptr),
-        expired_cert_(nullptr) {}
+        agent_host_can_close_(false) {}
 
   void SetUpOnMainThread() override {
     ok_cert_ =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
     expired_cert_ = net::ImportCertFromFile(net::GetTestCertsDirectory(),
                                             "expired_cert.pem");
   }
 
  protected:
   // WebContentsDelegate method:
@@ skipping 181 matching lines @@
   const scoped_refptr<net::X509Certificate>& last_shown_certificate() {
     return last_shown_certificate_;
   }
 
   const scoped_refptr<net::X509Certificate>& ok_cert() { return ok_cert_; }
 
   const scoped_refptr<net::X509Certificate>& expired_cert() {
     return expired_cert_;
   }
 
+  void set_agent_host_can_close() { agent_host_can_close_ = true; }
+
   std::unique_ptr<base::DictionaryValue> result_;
   scoped_refptr<DevToolsAgentHost> agent_host_;
   int last_sent_id_;
   std::vector<int> result_ids_;
   std::vector<std::string> notifications_;
   std::vector<std::string> console_messages_;
   std::vector<std::unique_ptr<base::DictionaryValue>> notification_params_;
 
  private:
   void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
@@ skipping 26 matching lines @@
       if (waiting_for_notification_ == notification) {
         waiting_for_notification_ = std::string();
         waiting_for_notification_params_ = base::WrapUnique(
             notification_params_[notification_params_.size() - 1]->DeepCopy());
         base::MessageLoop::current()->QuitNow();
       }
     }
   }
 
   void AgentHostClosed(DevToolsAgentHost* agent_host, bool replaced) override {
-    DCHECK(false);
+    if (!agent_host_can_close_)
+      NOTREACHED();
   }
 
   std::string waiting_for_notification_;
   std::unique_ptr<base::DictionaryValue> waiting_for_notification_params_;
   int waiting_for_command_result_id_;
   bool in_dispatch_;
   scoped_refptr<net::X509Certificate> last_shown_certificate_;
   scoped_refptr<net::X509Certificate> ok_cert_;
   scoped_refptr<net::X509Certificate> expired_cert_;
+  bool agent_host_can_close_;
 };
 
 class TestInterstitialDelegate : public InterstitialPageDelegate {
  private:
   // InterstitialPageDelegate:
   std::string GetHTMLContents() override { return "<p>Interstitial</p>"; }
 };
 
 class SyntheticKeyEventTest : public DevToolsProtocolTest {
  protected:
@@ skipping 589 matching lines @@
   // Ensure that the A.com process is still alive by executing a script in the
   // original tab.
   success = false;
   EXPECT_TRUE(ExecuteScriptAndExtractBool(shell(),
                                           "window.domAutomationController.send("
                                           "    !!window.open('', 'foo'));",
                                           &success));
   EXPECT_TRUE(success);
 }
 
-// CrashTab() works differently on Windows, leading to RFH removal before
-// RenderProcessGone is called. TODO(dgozman): figure out the problem.
-#if defined(OS_WIN)
-#define MAYBE_DoubleCrash DISABLED_DoubleCrash
-#else
-#define MAYBE_DoubleCrash DoubleCrash
-#endif
-IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, MAYBE_DoubleCrash) {
+IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, DoubleCrash) {
+  set_agent_host_can_close();
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL test_url = embedded_test_server()->GetURL("/devtools/navigation.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), GURL("about:blank"), 1);
   Attach();
   SendCommand("ServiceWorker.enable", nullptr);
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);
   CrashTab(shell()->web_contents());
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);
   CrashTab(shell()->web_contents());
   NavigateToURLBlockUntilNavigationsComplete(shell(), GURL("about:blank"), 1);
@@ skipping 616 matching lines @@
       EXPECT_EQ("polyglottal", value);
       found++;
     } else {
       FAIL();
     }
   }
   EXPECT_EQ(2u, found);
 }
 
 }  // namespace content