Abstract WebContentsObserver from Autofill shared code

components/autofill/browser/autocomplete_history_manager.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 "components/autofill/browser/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/prefs/pref_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/common/autofill_messages.h"
 #include "components/autofill/common/autofill_pref_names.h"
 #include "components/autofill/common/form_data.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "ipc/ipc_message_macros.h"
 
 using content::BrowserContext;
 using content::WebContents;
 
 namespace autofill {
 namespace {
 
 // Limit on the number of suggestions to appear in the pop-up menu under an
 // text input element in a form.
 const int kMaxAutocompleteMenuItems = 6;
 
 bool IsTextField(const FormFieldData& field) {
   return
       field.form_control_type == "text" ||
       field.form_control_type == "search" ||
       field.form_control_type == "tel" ||
       field.form_control_type == "url" ||
       field.form_control_type == "email" ||
       field.form_control_type == "text";
 }
 
 }  // namespace
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     WebContents* web_contents)
-    : content::WebContentsObserver(web_contents),
-      browser_context_(web_contents->GetBrowserContext()),
+    : browser_context_(web_contents->GetBrowserContext()),
+      web_contents_(web_contents),
       autofill_data_(
           AutofillWebDataService::FromBrowserContext(browser_context_)),
       pending_query_handle_(0),
       query_id_(0),
-      external_delegate_(NULL) {
+      external_delegate_(NULL),
+      send_IPC_(true) {
   autofill_enabled_.Init(
       prefs::kAutofillEnabled,
       components::UserPrefs::Get(browser_context_));
 }
 
 AutocompleteHistoryManager::~AutocompleteHistoryManager() {
   CancelPendingQuery();
 }
 
-bool AutocompleteHistoryManager::OnMessageReceived(
-    const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AutocompleteHistoryManager, message)
-    IPC_MESSAGE_HANDLER(AutofillHostMsg_RemoveAutocompleteEntry,

[blundell, 2013/06/04 17:30:48]

I moved the reception of this message into AutofillManager, which I saw already
had a RemoveAutocompleteEntry() method that forwarded to
AutocompleteHistoryManager. Any pointers on how to test this change would be
appreciated -- I could not find any tests that failed even when I commented out
the handling of this message entirely.

[Evan Stade, 2013/06/04 18:06:36]

Ilya would know for sure but my guess is that it's only used in the old-style
renderer-side autofill implentation. So you'd have to disable the native
autofill ui (in about:flags) to test this manually. But on the other hand it's
probably going away soon.

[Ilya Sherman, 2013/06/05 10:50:02]

Yes, Evan is correct -- this IPC message would only ever be generated by the
deprecated UI, support for which should be safe to rip out at this point.

[blundell, 2013/06/11 15:35:47]

Are you saying (a) that it's OK to just not handle this message at this point,
or (b) that the handling of this message will be removed in any case when
components/autofill/renderer/autofill_agent goes away? If the former, I'd rather
isolate that change into a different CL, as this CL is not intended to produce
any behavioral changes.

On 2013/06/05 10:50:02, Ilya Sherman wrote:

[Ilya Sherman, 2013/06/12 00:07:46]

(b), though not all of autofill_agent will be going away -- just the parts
handling the popup UI.

On 2013/06/11 15:35:47, blundell wrote:

-                        OnRemoveAutocompleteEntry)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
 void AutocompleteHistoryManager::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle h,
     const WDTypedResult* result) {
   DCHECK(pending_query_handle_);
   pending_query_handle_ = 0;
 
   if (!*autofill_enabled_) {
     SendSuggestions(NULL);
     return;
   }
@@ skipping 116 matching lines @@
     }
   }
 
   if (external_delegate_) {
     external_delegate_->OnSuggestionsReturned(
         query_id_,
         autofill_values_,
         autofill_labels_,
         autofill_icons_,
         autofill_unique_ids_);
-  } else {
-    Send(new AutofillMsg_SuggestionsReturned(routing_id(),
-                                             query_id_,
-                                             autofill_values_,
-                                             autofill_labels_,
-                                             autofill_icons_,
-                                             autofill_unique_ids_));
+  } else if (send_IPC_) {

[blundell, 2013/06/04 17:30:48]

This change is to preserve the behavior of the ExternalDelegate test --
AutocompleteHistoryManager no longer has a Send() method inherited from
WebContentsObserver.

+    web_contents_->Send(
+        new AutofillMsg_SuggestionsReturned(web_contents_->GetRoutingID(),
+                                            query_id_,
+                                            autofill_values_,
+                                            autofill_labels_,
+                                            autofill_icons_,
+                                            autofill_unique_ids_));
   }
 
   query_id_ = 0;
   autofill_values_.clear();
   autofill_labels_.clear();
   autofill_icons_.clear();
   autofill_unique_ids_.clear();
 }
 
 }  // namespace autofill