Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/ui/autofill/autofill_popup_controller_impl.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 "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 56 matching lines @@
 }  // namespace
 
 // static
 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
     WeakPtr<AutofillPopupControllerImpl> previous,
     WeakPtr<AutofillPopupDelegate> delegate,
     content::WebContents* web_contents,
     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() &&
       previous->container_view() == container_view &&
       previous->element_bounds() == element_bounds) {
     previous->ClearState();
     return previous;
   }
 
   if (previous.get())
     previous->Hide();
 
   AutofillPopupControllerImpl* controller =
@@ skipping 536 matching lines @@
   names_.clear();
   subtexts_.clear();
   icons_.clear();
   identifiers_.clear();
   full_names_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill