Revert of Extracting placeholder information from Webkit to Blimp

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 6f22bef294fbe13a5ff89c72fb0c66fa1e0b8a24..5fee5bf452a8c6375bd263059b599b6a28256a9a 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -86,7 +86,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
-#include "content/public/common/form_field_data.h"
 #include "content/public/common/isolated_world_ids.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.mojom.h"
@@ -425,8 +424,6 @@
 
   for (const auto& iter : visual_state_callbacks_)
     iter.second.Run(false);
-
-  form_field_data_callbacks_.clear();
 
   if (render_widget_host_ &&
       render_widget_host_->owned_by_render_frame_host()) {
@@ -734,8 +731,6 @@
     IPC_MESSAGE_HANDLER(FrameHostMsg_DispatchLoad, OnDispatchLoad)
     IPC_MESSAGE_HANDLER(FrameHostMsg_TextSurroundingSelectionResponse,
                         OnTextSurroundingSelectionResponse)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_FocusedFormFieldDataResponse,
-                        OnFocusedFormFieldDataResponse)
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Events, OnAccessibilityEvents)
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_LocationChanges,
                         OnAccessibilityLocationChanges)
@@ -1533,11 +1528,7 @@
   // since we're never going to get a response from this renderer.
   for (const auto& iter : ax_tree_snapshot_callbacks_)
     iter.second.Run(ui::AXTreeUpdate());
-
   ax_tree_snapshot_callbacks_.clear();
-  javascript_callbacks_.clear();
-  visual_state_callbacks_.clear();
-  form_field_data_callbacks_.clear();
 
   // Ensure that future remote interface requests are associated with the new
   // process's channel.
@@ -1723,24 +1714,6 @@
   text_surrounding_selection_callback_.Run(content, start_offset, end_offset);
   // Reset the callback for enabling early exit from future request.
   text_surrounding_selection_callback_.Reset();
-}
-
-void RenderFrameHostImpl::RequestFocusedFormFieldData(
-    FormFieldDataCallback& callback) {
-  static int next_id = 1;
-  int request_id = ++next_id;
-  form_field_data_callbacks_[request_id] = callback;
-  Send(new FrameMsg_FocusedFormFieldDataRequest(GetRoutingID(), request_id));
-}
-
-void RenderFrameHostImpl::OnFocusedFormFieldDataResponse(
-    int request_id,
-    const FormFieldData& field_data) {
-  auto it = form_field_data_callbacks_.find(request_id);
-  if (it != form_field_data_callbacks_.end()) {
-    it->second.Run(field_data);
-    form_field_data_callbacks_.erase(it);
-  }
 }
 
 void RenderFrameHostImpl::OnDidAccessInitialDocument() {