PlzNavigate: Fix the failing ContinueWhereILeftOffTest.PostWithPassword test.

content/renderer/render_frame_impl.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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 612 matching lines @@
 
   const RequestExtraData* extra_data =
       static_cast<RequestExtraData*>(info.urlRequest.getExtraData());
   DCHECK(extra_data);
   return CommonNavigationParams(
       info.urlRequest.url(), referrer, extra_data->transition_type(),
       navigation_type, true, info.replacesCurrentHistoryItem, ui_timestamp,
       report_type, GURL(), GURL(),
       static_cast<LoFiState>(info.urlRequest.getLoFiState()),
       base::TimeTicks::Now(), info.urlRequest.httpMethod().latin1(),
+      (!info.urlRequest.httpBody().isNull() ?

[jam, 2016/10/13 04:34:30]

nit: this would be more readable without the double negative, i.e.

(info.urlRequest.httpBody().isNull() ? false :
info.urlRequest.httpBody().containsPasswordData())

+          info.urlRequest.httpBody().containsPasswordData() : false),
       GetRequestBodyForWebURLRequest(info.urlRequest));
 }
 
 media::Context3D GetSharedMainThreadContext3D(
     scoped_refptr<ContextProviderCommandBuffer> provider) {
   if (!provider)
     return media::Context3D();
   return media::Context3D(provider->ContextGL(), provider->GrContext());
 }
 
@@ skipping 4947 matching lines @@
       blink::WebHistoryDifferentDocumentLoad;
   bool should_load_request = false;
   WebHistoryItem item_for_history_navigation;
   WebURLRequest request =
       CreateURLRequestForNavigation(common_params, std::move(stream_params),
                                     frame_->isViewSourceModeEnabled());
   request.setFrameType(IsTopLevelNavigation(frame_)
                            ? blink::WebURLRequest::FrameTypeTopLevel
                            : blink::WebURLRequest::FrameTypeNested);
 
-  if (IsBrowserSideNavigationEnabled() && common_params.post_data)
-    request.setHTTPBody(GetWebHTTPBodyForRequestBody(common_params.post_data));
-
+  if (IsBrowserSideNavigationEnabled() && common_params.post_data) {
+    WebHTTPBody http_body =
+        GetWebHTTPBodyForRequestBody(common_params.post_data);
+    // We need to preserve the fact that the HTTP body contains passwords. This
+    // ensures that the page state is updated correctly in the browser. This
+    // eventually ensures that the page state is stripped of password data
+    // before being serialized to disk.
+    http_body.setContainsPasswordData(common_params.post_contains_passwords);
+    request.setHTTPBody(http_body);
+  }
   // Used to determine whether this frame is actually loading a request as part
   // of a history navigation.
   bool has_history_navigation_in_frame = false;
 
 #if defined(OS_ANDROID)
   request.setHasUserGesture(request_params.has_user_gesture);
 #endif
 
   if (browser_side_navigation) {
     // PlzNavigate: Make sure that Blink's loader will not try to use browser
@@ skipping 878 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content