Fix subframe loads with RenderViewTest when PlzNavigate is enabled.

content/test/test_render_frame.cc

 // Copyright 2015 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 "content/test/test_render_frame.h"
 
 #include "content/common/navigation_params.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/resource_response.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace content {
 
 // static
 RenderFrameImpl* TestRenderFrame::CreateTestRenderFrame(
     const RenderFrameImpl::CreateParams& params) {
   return new TestRenderFrame(params);
 }
 
 TestRenderFrame::TestRenderFrame(const RenderFrameImpl::CreateParams& params)
@@ skipping 42 matching lines @@
   OnSetAccessibilityMode(new_mode);
 }
 
 void TestRenderFrame::SetCompositionFromExistingText(
     int start,
     int end,
     const std::vector<blink::WebCompositionUnderline>& underlines) {
   OnSetCompositionFromExistingText(start, end, underlines);
 }
 
+blink::WebNavigationPolicy TestRenderFrame::decidePolicyForNavigation(
+    const blink::WebFrameClient::NavigationPolicyInfo& info) {
+  if (IsBrowserSideNavigationEnabled() &&
+      info.urlRequest.checkForBrowserSideNavigation() &&

[ananta, 2016/12/08 22:57:05]

is this check correct? Should it be !checkforBrowser?

[jam, 2016/12/08 23:01:28]

The purpose of this if statement is to disable plznavigate for subframe
requests, which is done by setting CheckForBrowserSideNavigation=false. If
"!checkforBrowser" is the check, then that's already the case.

+      GetWebFrame()->parent() &&
+      info.form.isNull()) {
+    // RenderViewTest::LoadHTML already disables PlzNavigate for the main frame
+    // requests. However if the loaded html has a subframe, the WebURLRequest
+    // will be created inside Blink and it won't have this flag set.
+    info.urlRequest.setCheckForBrowserSideNavigation(false);
+  }
+  return RenderFrameImpl::decidePolicyForNavigation(info);
+}
+
 }  // namespace content