Add frame_tree_node_id to navigation parameters.

content/browser/web_contents/web_contents_impl_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 "base/values.h"
+#include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/load_notification_details.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 273 matching lines @@
   EXPECT_EQ(init_size, observer.rwhv_create_size());
   // RenderViewSizeObserver resizes WebContentsView in NavigateToPendingEntry,
   // so both WebContentsView and RenderWidgetHostView adopt this new size.
   new_size.Enlarge(size_insets.width(), size_insets.height());
   EXPECT_EQ(new_size,
             shell()->web_contents()->GetRenderWidgetHostView()->GetViewBounds().
                 size());
   EXPECT_EQ(new_size, shell()->web_contents()->GetView()->GetContainerSize());
 }
 
+IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, OpenURLSubframe) {
+
+  // Navigate with source_frame_id 3, FrameTreeNode ID 4.
+  const GURL url("http://foo");
+  OpenURLParams params(url, Referrer(), 3, 4, CURRENT_TAB, PAGE_TRANSITION_LINK,
+                       true);
+  shell()->web_contents()->OpenURL(params);
+
+  // Make sure the NavigationEntry ends up with the FrameTreeNode ID.
+  NavigationController* controller = &shell()->web_contents()->GetController();
+  EXPECT_TRUE(controller->GetPendingEntry());
+  EXPECT_EQ(4, NavigationEntryImpl::FromNavigationEntry(
+                controller->GetPendingEntry())->frame_tree_node_id());
+}
+
+
 }  // namespace content