When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO…

chrome/browser/ui/search/search_tab_helper.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 "chrome/browser/ui/search/search_tab_helper.h"
 
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/common/url_constants.h"
@@ skipping 70 matching lines @@
   // when "committed".  This is because NTP is rendered natively so is faster
   // to render than the web contents and we need to coordinate the animations.
   if (IsNTP(url)) {
     ntp_load_state_ = WAITING_FOR_FRAME_ID;
     UpdateModelBasedOnURL(url, ntp_load_state_, !is_initial_navigation_commit_);
   }
 }
 
 void SearchTabHelper::DidStartProvisionalLoadForFrame(
     int64 frame_id,
+    int64 parent_frame_id,
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
     content::RenderViewHost* render_view_host) {
   if (ntp_load_state_ == WAITING_FOR_FRAME_ID &&
       is_main_frame && IsNTP(validated_url)) {
     content::NavigationEntry* pending_entry =
         web_contents()->GetController().GetPendingEntry();
     if (pending_entry && IsNTP(pending_entry->GetURL())) {
       ntp_load_state_ = WAITING_FOR_FRAME_LOAD;
@@ skipping 72 matching lines @@
 }
 
 content::RenderWidgetHost* SearchTabHelper::GetRenderWidgetHost() {
   content::RenderWidgetHostView* rwhv =
       web_contents()->GetRenderWidgetHostView();
   return rwhv ? rwhv->GetRenderWidgetHost() : NULL;
 }
 
 }  // namespace search
 }  // namespace chrome