| 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/ui/autofill/autofill_popup_view.h" | 9 #include "chrome/browser/ui/autofill/autofill_popup_view.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 gfx::Rect new_bounds = browser()->window()->GetBounds(); | 130 gfx::Rect new_bounds = browser()->window()->GetBounds(); |
| 131 new_bounds.Inset(1, 1); | 131 new_bounds.Inset(1, 1); |
| 132 browser()->window()->SetBounds(new_bounds); | 132 browser()->window()->SetBounds(new_bounds); |
| 133 | 133 |
| 134 autofill_external_delegate_->WaitForPopupHidden(); | 134 autofill_external_delegate_->WaitForPopupHidden(); |
| 135 EXPECT_TRUE(autofill_external_delegate_->popup_hidden()); | 135 EXPECT_TRUE(autofill_external_delegate_->popup_hidden()); |
| 136 } | 136 } |
| 137 | 137 |
| 138 // This test checks that the browser doesn't crash if the delegate is deleted | 138 // This test checks that the browser doesn't crash if the delegate is deleted |
| 139 // before the popup is hidden. | 139 // before the popup is hidden. |
| 140 #if defined(OS_MACOSX) |
| 141 // Flaky on Mac 10.9 in debug mode. http://crbug.com/710439 |
| 142 #define MAYBE_DeleteDelegateBeforePopupHidden \ |
| 143 DISABLED_DeleteDelegateBeforePopupHidden |
| 144 #else |
| 145 #define MAYBE_DeleteDelegateBeforePopupHidden DeleteDelegateBeforePopupHidden |
| 146 #endif |
| 140 IN_PROC_BROWSER_TEST_F(AutofillPopupControllerBrowserTest, | 147 IN_PROC_BROWSER_TEST_F(AutofillPopupControllerBrowserTest, |
| 141 DeleteDelegateBeforePopupHidden){ | 148 MAYBE_DeleteDelegateBeforePopupHidden) { |
| 142 GenerateTestAutofillPopup(autofill_external_delegate_.get()); | 149 GenerateTestAutofillPopup(autofill_external_delegate_.get()); |
| 143 | 150 |
| 144 // Delete the external delegate here so that is gets deleted before popup is | 151 // Delete the external delegate here so that is gets deleted before popup is |
| 145 // hidden. This can happen if the web_contents are destroyed before the popup | 152 // hidden. This can happen if the web_contents are destroyed before the popup |
| 146 // is hidden. See http://crbug.com/232475 | 153 // is hidden. See http://crbug.com/232475 |
| 147 autofill_external_delegate_.reset(); | 154 autofill_external_delegate_.reset(); |
| 148 } | 155 } |
| 149 | 156 |
| 150 } // namespace autofill | 157 } // namespace autofill |
| OLD | NEW |