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

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3541 matching lines @@
       document_state->set_request_time(Time::FromDoubleT(event_time));
   }
 
   // Start time is only set after request time.
   document_state->set_start_load_time(Time::Now());
 
   bool is_top_most = !frame->parent();
   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(
       RenderViewObserver, observers_, DidStartProvisionalLoad(frame));
 
   Send(new ViewHostMsg_DidStartProvisionalLoadForFrame(
        routing_id_, frame->identifier(),
        frame->parent() ? frame->parent()->identifier() : -1,
        is_top_most, ds->request().url()));
 }
@@ skipping 2928 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content