PlzNavigate: provide the FrameTreeNode ID to the network stack

content/browser/frame_host/frame_tree_node.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/browser/frame_host/frame_tree_node.h"
 
 #include <queue>
 
 #include "base/command_line.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 162 matching lines @@
       effective_sandbox_flags_ != replication_state_.sandbox_flags;
   effective_sandbox_flags_ = replication_state_.sandbox_flags;
   return did_change_flags;
 }
 
 void FrameTreeNode::SetNavigationRequest(
     scoped_ptr<NavigationRequest> navigation_request) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   ResetNavigationRequest(false);
+  DidStartLoading(true);

[nasko, 2015/04/27 14:24:11]

Does that and the DidStopLoading code fix issues on their own? I wonder if they
belong logically in a separate CL.

[clamy, 2015/04/27 14:34:44]

No this was a test patch that I uploaded and was reviewing before sending it
out. I have to add this locally for the DidStart/StopLoading to get signaled and
the tests to work (and normally remove it when sending patches out but forgot
here). Hopefully Fabrice's CL will be ready soon.

   // TODO(clamy): perform the StartLoading logic here.
   navigation_request_ = navigation_request.Pass();
 }
 
 void FrameTreeNode::ResetNavigationRequest(bool is_commit) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   // Upon commit the current NavigationRequest will be reset. There should be no
   // cleanup performed since the navigation is still ongoing. If the reset
   // corresponds to a cancelation, the RenderFrameHostManager should clean up
   // any speculative RenderFrameHost it created for the navigation.
   if (navigation_request_ && !is_commit) {
+    DidStopLoading();
     // TODO(clamy): perform the StopLoading logic.
     render_manager_.CleanUpNavigation();
   }
   navigation_request_.reset();
 }
 
 bool FrameTreeNode::has_started_loading() const {
   return loading_progress_ != kLoadingProgressNotStarted;
 }
 
@@ skipping 52 matching lines @@
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "465796 FrameTreeNode::DidStopLoading::End"));
 }
 
 void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
   loading_progress_ = load_progress;
   frame_tree_->UpdateLoadProgress();
 }
 
 }  // namespace content