Refactor Autofill for out of process iframes (OOPIF).

components/autofill/content/browser/request_autocomplete_manager.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 "components/autofill/content/browser/request_autocomplete_manager.h"
 
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
 #include "components/autofill/core/common/form_data.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
 #include "url/gurl.h"
 
 namespace autofill {
 
 namespace {
 
 blink::WebFormElement::AutocompleteResult ToWebkitAutocompleteResult(
     AutofillClient::RequestAutocompleteResult result) {
@@ skipping 36 matching lines @@
 
 void RequestAutocompleteManager::OnCancelRequestAutocomplete() {
   autofill_driver_->autofill_manager()->client()
       ->HideRequestAutocompleteDialog();
 }
 
 void RequestAutocompleteManager::ReturnAutocompleteResult(
     AutofillClient::RequestAutocompleteResult result,
     const base::string16& debug_message,
     const FormStructure* form_structure) {
-  // autofill_driver_->web_contents() will be NULL when the interactive
-  // autocomplete is closed due to a tab or browser window closing.
-  if (!autofill_driver_->web_contents())
-    return;
-
-  content::RenderViewHost* host =
-      autofill_driver_->web_contents()->GetRenderViewHost();
+  content::RenderFrameHost* host = autofill_driver_->render_frame_host();
   if (!host)
     return;
 
   FormData form_data;
   if (form_structure) {
     form_data = form_structure->ToFormData();
     for (size_t i = 0; i < form_data.fields.size(); ++i) {
       if(!form_data.fields[i].value.empty())
         form_data.fields[i].is_autofilled = true;
     }
   }
 
   host->Send(new AutofillMsg_RequestAutocompleteResult(
       host->GetRoutingID(),
       ToWebkitAutocompleteResult(result),
       debug_message,
       form_data));
 }
 
 void RequestAutocompleteManager::ShowRequestAutocompleteDialog(
     const FormData& form,
     const GURL& source_url,
     const AutofillClient::ResultCallback& callback) {
   AutofillClient* client = autofill_driver_->autofill_manager()->client();
   client->ShowRequestAutocompleteDialog(form, source_url, callback);
 }
 
 }  // namespace autofill