Revert of PlzNavigate: inform the WebFrameClient that a form will be submitted

content/renderer/render_frame_impl.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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2860 matching lines @@
     return WebHistoryItem();
 
   return render_view_->history_controller()->GetItemForNewChildFrame(this);
 }
 
 void RenderFrameImpl::willSendSubmitEvent(const blink::WebFormElement& form) {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WillSendSubmitEvent(form));
 }
 
 void RenderFrameImpl::willSubmitForm(const blink::WebFormElement& form) {
-  // With PlzNavigate-enabled, this will be called before a DataSource has been
-  // set-up.
-  // TODO(clamy): make sure the internal state is properly updated at some
-  // point in the navigation.
-  if (!IsBrowserSideNavigationEnabled()) {
-    DocumentState* document_state =
-        DocumentState::FromDataSource(frame_->provisionalDataSource());
-    NavigationStateImpl* navigation_state =
-        static_cast<NavigationStateImpl*>(document_state->navigation_state());
-    InternalDocumentStateData* internal_data =
-        InternalDocumentStateData::FromDocumentState(document_state);
+  DocumentState* document_state =
+      DocumentState::FromDataSource(frame_->provisionalDataSource());
+  NavigationStateImpl* navigation_state =
+      static_cast<NavigationStateImpl*>(document_state->navigation_state());
+  InternalDocumentStateData* internal_data =
+      InternalDocumentStateData::FromDocumentState(document_state);
 
-    if (ui::PageTransitionCoreTypeIs(navigation_state->GetTransitionType(),
-                                     ui::PAGE_TRANSITION_LINK)) {
-      navigation_state->set_transition_type(ui::PAGE_TRANSITION_FORM_SUBMIT);
-    }
+  if (ui::PageTransitionCoreTypeIs(navigation_state->GetTransitionType(),
+                                   ui::PAGE_TRANSITION_LINK)) {
+    navigation_state->set_transition_type(ui::PAGE_TRANSITION_FORM_SUBMIT);
+  }
 
-    // Save these to be processed when the ensuing navigation is committed.
-    WebSearchableFormData web_searchable_form_data(form);
-    internal_data->set_searchable_form_url(web_searchable_form_data.url());
-    internal_data->set_searchable_form_encoding(
-        web_searchable_form_data.encoding().utf8());
-  }
+  // Save these to be processed when the ensuing navigation is committed.
+  WebSearchableFormData web_searchable_form_data(form);
+  internal_data->set_searchable_form_url(web_searchable_form_data.url());
+  internal_data->set_searchable_form_encoding(
+      web_searchable_form_data.encoding().utf8());
 
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WillSubmitForm(form));
 }
 
 void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,
                                           blink::WebDataSource* datasource) {
   DCHECK(!frame_ || frame_ == frame);
 
   bool content_initiated = !pending_navigation_params_.get();
 
@@ skipping 3206 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content