| Index: chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
|
| diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
|
| index fd4573ffc48fad816f3686fe8c6db9119cb53f14..9b8f81b8ee99e9ce90e999dc4c9777859b70e94c 100644
|
| --- a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
|
| +++ b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
|
| @@ -72,31 +72,27 @@ class AutofillPopupControllerBrowserTest
|
| virtual ~AutofillPopupControllerBrowserTest() {}
|
|
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| - web_contents_ = browser()->tab_strip_model()->GetActiveWebContents();
|
| - ASSERT_TRUE(web_contents_ != NULL);
|
| - Observe(web_contents_);
|
| + content::WebContents* web_contents =
|
| + browser()->tab_strip_model()->GetActiveWebContents();
|
| + ASSERT_TRUE(web_contents != NULL);
|
| + Observe(web_contents);
|
|
|
| ContentAutofillDriver* driver =
|
| - ContentAutofillDriver::FromWebContents(web_contents_);
|
| + ContentAutofillDriver::FromWebContents(web_contents);
|
| autofill_external_delegate_.reset(
|
| new TestAutofillExternalDelegate(
|
| - web_contents_,
|
| + 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.
|
| - virtual void WebContentsDestroyed(content::WebContents* web_contents)
|
| - OVERRIDE {
|
| - DCHECK_EQ(web_contents_, web_contents);
|
| -
|
| + virtual void WebContentsDestroyed() OVERRIDE {
|
| autofill_external_delegate_.reset();
|
| }
|
|
|
| protected:
|
| - content::WebContents* web_contents_;
|
| -
|
| scoped_ptr<TestAutofillExternalDelegate> autofill_external_delegate_;
|
| };
|
|
|
|
|