Create NavigationHandle after beforeunload with PlzNavigate.

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 1186 matching lines @@
       num_to_wait_for_ = num_to_wait_for;
       RunMessageLoop();
     }
     num_to_wait_for_ = 0;
   }
 
  private:
   int num_finished_;
   int num_to_wait_for_;
 };
+
+class LoadFinishedObserver : public content::WebContentsObserver {
+ public:
+  explicit LoadFinishedObserver(WebContents* web_contents)
+      : WebContentsObserver(web_contents),
+        num_finished_(0),
+        num_to_wait_for_(0) {}
+
+  ~LoadFinishedObserver() override {}
+
+  void DidStopLoading() override {
+    num_finished_++;
+    if (num_finished_ >= num_to_wait_for_ && num_to_wait_for_ != 0) {
+      base::MessageLoop::current()->QuitNow();
+    }
+  }
+
+  void WaitForLoadsToFinish(int num_to_wait_for) {

[nasko, 2017/05/24 14:20:03]

nit: Arguably, there are no other callers other than the value of 1, so we might
not need a parameter at all.

[clamy, 2017/05/24 18:34:38]

Done.

+    if (num_finished_ < num_to_wait_for) {
+      num_to_wait_for_ = num_to_wait_for;
+      RunMessageLoop();
+    }
+    num_to_wait_for_ = 0;
+  }
+
+ private:
+  int num_finished_;
+  int num_to_wait_for_;
+};
+
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, PageStopLoading) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // Navigate to about:blank first so we can make sure there is a target page we
   // can attach to, and have Page.setControlNavigations complete before we start
   // the navigations we're interested in.
   NavigateToURLBlockUntilNavigationsComplete(shell(), GURL("about:blank"), 1);
   Attach();
 
   std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
   params->SetBoolean("enabled", true);
   SendCommand("Page.setControlNavigations", std::move(params), true);
 
-  NavigationFinishedObserver navigation_finished_observer(
-      shell()->web_contents());
+  LoadFinishedObserver load_finished_observer(shell()->web_contents());
 
   // The page will try to navigate twice, however since
   // Page.setControlNavigations is true, it'll wait for confirmation before
   // committing to the navigation.
   GURL test_url = embedded_test_server()->GetURL(
       "/devtools/control_navigations/meta_tag.html");
   shell()->LoadURL(test_url);
 
   // Stop all navigations.
   SendCommand("Page.stopLoading", nullptr);
 
   // Wait for the initial navigation to finish.
-  navigation_finished_observer.WaitForNavigationsToFinish(1);
+  load_finished_observer.WaitForLoadsToFinish(1);
 }
 
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, ControlNavigationsMainFrame) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // Navigate to about:blank first so we can make sure there is a target page we
   // can attach to, and have Page.setControlNavigations complete before we start
   // the navigations we're interested in.
   NavigateToURLBlockUntilNavigationsComplete(shell(), GURL("about:blank"), 1);
   Attach();
@@ skipping 567 matching lines @@
       EXPECT_EQ("polyglottal", value);
       found++;
     } else {
       FAIL();
     }
   }
   EXPECT_EQ(2u, found);
 }
 
 }  // namespace content