Fix initial erroneous navigation in iframe to not add history entry.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 01cb2bcc0b8b7a0153100818c456cd04afde8a79..3280bd387900b38a91025bfe45113f61be831caa 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3559,11 +3559,14 @@ void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {
   if (is_top_most) {
     navigation_gesture_ = WebUserGestureIndicator::isProcessingUserGesture() ?
         NavigationGestureUser : NavigationGestureAuto;
-  } else if (frame->parent()->isLoading()) {
-    // Take note of AUTO_SUBFRAME loads here, so that we can know how to
-    // load an error page.  See didFailProvisionalLoad.
-    document_state->navigation_state()->set_transition_type(
-        PAGE_TRANSITION_AUTO_SUBFRAME);
+  } else {

[Charlie Reis, 2013/10/02 15:45:49]

Style nit: Why move away from "else if"?

[nasko, 2013/10/02 23:06:46]

Intermediate steps where I had more statements. Fixed now.

+    if (ds->replacesCurrentHistoryItem()) {
+      // Subframe navigations, which don't add session history items must be

[Charlie Reis, 2013/10/02 15:45:49]

nit: "navigations, which" -> "navigations that" (no comma)

[nasko, 2013/10/02 23:06:46]

Done.

+      // marked with AUTO_SUBFRAME. See also didFailProvisionalLoad for how we
+      // handle loading of error pages.
+      document_state->navigation_state()->set_transition_type(
+          PAGE_TRANSITION_AUTO_SUBFRAME);
+    }
   }
 
   FOR_EACH_OBSERVER(