Abstracted AutofillMsg_SetNodeText IPC out of core autofill code.

components/autofill/core/browser/autofill_external_delegate.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/core/browser/autofill_external_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/common/autofill_messages.h"

[blundell, 2013/11/13 11:55:45]

You should be able to remove this now.

[jif-google, 2013/11/13 14:20:25]

Done.

 #include "content/public/browser/render_view_host.h"

[blundell, 2013/11/13 11:55:45]

You should be be able to remove this now.

[jif-google, 2013/11/13 14:20:25]

Done.

 #include "content/public/browser/web_contents.h"
 #include "grit/component_strings.h"
 #include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::RenderViewHost;

[blundell, 2013/11/13 11:55:45]

You should be able to remove this now.

[jif-google, 2013/11/13 14:20:25]

Done.

 using blink::WebAutofillClient;
 
 namespace autofill {
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     content::WebContents* web_contents,
     AutofillManager* autofill_manager,
     AutofillDriver* autofill_driver)
-    : web_contents_(web_contents),

[blundell, 2013/11/13 11:55:45]

Yay!

-      autofill_manager_(autofill_manager),
+    : autofill_manager_(autofill_manager),
       autofill_driver_(autofill_driver),
       password_autofill_manager_(web_contents),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_autofill_suggestion_(false),
       has_shown_autofill_popup_for_current_edit_(false),
       weak_ptr_factory_(this) {
   DCHECK(autofill_manager);
 }
 
@@ skipping 134 matching lines @@
 void AutofillExternalDelegate::DidSelectSuggestion(int identifier) {
   ClearPreviewedForm();
 
   // Only preview the data if it is a profile.
   if (identifier > 0)
     FillAutofillFormData(identifier, true);
 }
 
 void AutofillExternalDelegate::DidAcceptSuggestion(const base::string16& value,
                                                    int identifier) {
-  RenderViewHost* host = web_contents_->GetRenderViewHost();
-
   if (identifier == WebAutofillClient::MenuItemIDAutofillOptions) {
     // User selected 'Autofill Options'.
     autofill_manager_->OnShowAutofillDialog();
   } else if (identifier == WebAutofillClient::MenuItemIDClearForm) {
     // User selected 'Clear form'.
     autofill_driver_->RendererShouldClearFilledForm();
   } else if (identifier == WebAutofillClient::MenuItemIDPasswordEntry) {
     bool success = password_autofill_manager_.DidAcceptAutofillSuggestion(
         autofill_query_field_, value);
     DCHECK(success);
   } else if (identifier == WebAutofillClient::MenuItemIDDataListEntry) {
     autofill_driver_->RendererShouldAcceptDataListSuggestion(value);
   } else if (identifier == WebAutofillClient::MenuItemIDAutocompleteEntry) {
     // User selected an Autocomplete, so we fill directly.
-    host->Send(new AutofillMsg_SetNodeText(host->GetRoutingID(), value));
+    autofill_driver_->RendererShouldSetNodeText(value);
   } else {
     FillAutofillFormData(identifier, false);
   }
 
   autofill_manager_->delegate()->HideAutofillPopup();
 }
 
 void AutofillExternalDelegate::RemoveSuggestion(const base::string16& value,
                                                 int identifier) {
   if (identifier > 0) {
@@ skipping 147 matching lines @@
   // Set the values that all datalist elements share.
   autofill_icons->insert(autofill_icons->begin(),
                          data_list_values_.size(),
                          base::string16());
   autofill_unique_ids->insert(autofill_unique_ids->begin(),
                               data_list_values_.size(),
                               WebAutofillClient::MenuItemIDDataListEntry);
 }
 
 }  // namespace autofill