Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

Index: chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
index 72e6c2b13c7e0e5130b93fa8cd6b2cd77fb03810..ced23b6c5b05cade7af96cc1086384c0e2ca494a 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -74,9 +74,8 @@ WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
     gfx::NativeView container_view,
     const gfx::RectF& element_bounds,
     base::i18n::TextDirection text_direction) {
-  DCHECK(!previous.get() || previous->delegate_.get() == delegate.get());
-
   if (previous.get() && previous->web_contents() == web_contents &&
+      previous->delegate_.get() == delegate.get() &&

[vabr (Chromium), 2014/11/17 15:08:49]

NB: Here you seem to change the behaviour for the situation where there is a
previous controller, but with a different delegate.
As long as that's your intention, I have no objections, as I'm not familiar with
this part of the code and you are.

[Evan Stade, 2014/11/17 20:34:39]

Yea, I think it's ok, and I actually can't think of a situation where it would
come up in practice.

       previous->container_view() == container_view &&
       previous->element_bounds() == element_bounds) {
     previous->ClearState();