Fix RenderFrameCreated and RenderFrameDeleted WebContentsObserver methods

chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/test_autofill_external_delegate.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 
 namespace autofill {
 namespace {
 
 class TestAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
   TestAutofillExternalDelegate(content::WebContents* web_contents,
                                AutofillManager* autofill_manager,
                                AutofillDriver* autofill_driver)
       : AutofillExternalDelegate(autofill_manager, autofill_driver),
         popup_hidden_(true) {}
   ~TestAutofillExternalDelegate() override {}
 
   void OnPopupShown() override {
     popup_hidden_ = false;
 
     AutofillExternalDelegate::OnPopupShown();
   }
 
   void OnPopupHidden() override {
     popup_hidden_ = true;
 
     if (message_loop_runner_.get())
       message_loop_runner_->Quit();
-
-    AutofillExternalDelegate::OnPopupHidden();
   }
 
   void WaitForPopupHidden() {
     if (popup_hidden_)
       return;
 
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
   }
 
@@ skipping 26 matching lines @@
             ->DriverForFrame(web_contents->GetMainFrame());
     autofill_external_delegate_.reset(
        new TestAutofillExternalDelegate(
            web_contents,
            driver->autofill_manager(),
            driver));
   }
 
   // Normally the WebContents will automatically delete the delegate, but here
   // the delegate is owned by this test, so we have to manually destroy.
-  void WebContentsDestroyed() override { autofill_external_delegate_.reset(); }
+  void RenderFrameDeleted(content::RenderFrameHost* rfh) override {
+    if (!rfh->GetParent())
+      autofill_external_delegate_.reset();
+  }
 
  protected:
   scoped_ptr<TestAutofillExternalDelegate> autofill_external_delegate_;
 };
 
 #if defined(OS_MACOSX)
 // Fails on Mac OS, see crbug/453256
 #define MAYBE_DoNotHidePopupOnWindowMove DISABLED_DoNotHidePopupOnWindowMove
 #else
 #define MAYBE_DoNotHidePopupOnWindowMove DoNotHidePopupOnWindowMove
@@ skipping 32 matching lines @@
                        DeleteDelegateBeforePopupHidden){
   GenerateTestAutofillPopup(autofill_external_delegate_.get());
 
   // Delete the external delegate here so that is gets deleted before popup is
   // hidden. This can happen if the web_contents are destroyed before the popup
   // is hidden. See http://crbug.com/232475
   autofill_external_delegate_.reset();
 }
 
 }  // namespace autofill