| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "chrome/browser/ui/autofill/autofill_popup_view.h" | 7 #include "chrome/browser/ui/autofill/autofill_popup_view.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_window.h" | 9 #include "chrome/browser/ui/browser_window.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 DISALLOW_COPY_AND_ASSIGN(TestAutofillExternalDelegate); | 62 DISALLOW_COPY_AND_ASSIGN(TestAutofillExternalDelegate); |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 } // namespace | 65 } // namespace |
| 66 | 66 |
| 67 class AutofillPopupControllerBrowserTest | 67 class AutofillPopupControllerBrowserTest |
| 68 : public InProcessBrowserTest, | 68 : public InProcessBrowserTest, |
| 69 public content::WebContentsObserver { | 69 public content::WebContentsObserver { |
| 70 public: | 70 public: |
| 71 AutofillPopupControllerBrowserTest() {} | 71 AutofillPopupControllerBrowserTest() {} |
| 72 virtual ~AutofillPopupControllerBrowserTest() {} | 72 ~AutofillPopupControllerBrowserTest() override {} |
| 73 | 73 |
| 74 void SetUpOnMainThread() override { | 74 void SetUpOnMainThread() override { |
| 75 content::WebContents* web_contents = | 75 content::WebContents* web_contents = |
| 76 browser()->tab_strip_model()->GetActiveWebContents(); | 76 browser()->tab_strip_model()->GetActiveWebContents(); |
| 77 ASSERT_TRUE(web_contents != NULL); | 77 ASSERT_TRUE(web_contents != NULL); |
| 78 Observe(web_contents); | 78 Observe(web_contents); |
| 79 | 79 |
| 80 ContentAutofillDriver* driver = | 80 ContentAutofillDriver* driver = |
| 81 ContentAutofillDriver::FromWebContents(web_contents); | 81 ContentAutofillDriver::FromWebContents(web_contents); |
| 82 autofill_external_delegate_.reset( | 82 autofill_external_delegate_.reset( |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 MAYBE_DeleteDelegateBeforePopupHidden){ | 126 MAYBE_DeleteDelegateBeforePopupHidden){ |
| 127 GenerateTestAutofillPopup(autofill_external_delegate_.get()); | 127 GenerateTestAutofillPopup(autofill_external_delegate_.get()); |
| 128 | 128 |
| 129 // Delete the external delegate here so that is gets deleted before popup is | 129 // Delete the external delegate here so that is gets deleted before popup is |
| 130 // hidden. This can happen if the web_contents are destroyed before the popup | 130 // hidden. This can happen if the web_contents are destroyed before the popup |
| 131 // is hidden. See http://crbug.com/232475 | 131 // is hidden. See http://crbug.com/232475 |
| 132 autofill_external_delegate_.reset(); | 132 autofill_external_delegate_.reset(); |
| 133 } | 133 } |
| 134 | 134 |
| 135 } // namespace autofill | 135 } // namespace autofill |
| OLD | NEW |