Switch AutofillManager to be UserData on WebContents.

chrome/browser/autofill/autofill_external_delegate.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 "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 92 matching lines @@
     // No suggestions, any popup currently showing is obsolete.
     HideAutofillPopup();
     return;
   }
 
   // Send to display.
   if (autofill_query_field_.is_focusable) {
     popup_visible_ = true;
     ApplyAutofillSuggestions(values, labels, icons, ids);
 
-    tab_contents_->autofill_manager()->OnDidShowAutofillSuggestions(
+    autofill_manager_->OnDidShowAutofillSuggestions(

[Jói, 2012/10/01 10:45:19]

Is your modification to autofill_external_delegate.h missing from this patch?

[Avi (use Gerrit), 2012/10/01 15:32:26]

What are you referring to? I'm using git so "missing from this patch" doesn't
happen. This patch compiles as-is when applied over the previous one.

What's going on here is that the external delegate is created by passing in both
the tab contents and the manager for it. Everywhere but here, when the manager
is needed it's referred to by the value passed in, not via the TabContents. So
I'm fixing it here.

         has_autofill_item && !has_shown_autofill_popup_for_current_edit_);
     has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
   }
 }
 
 void AutofillExternalDelegate::OnShowPasswordSuggestions(
     const std::vector<string16>& suggestions,
     const webkit::forms::FormField& field,
     const gfx::Rect& bounds) {
   autofill_query_field_ = field;
@@ skipping 224 matching lines @@
 
 
 #if defined(OS_MACOSX)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContents*, AutofillManager*) {
   return NULL;
 }
 
 #endif