Index: chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
index 8cbcdeb62ec8b6f78f3f7cab286966fca88a2d58..2438a759f60c5f8d1490ddcdfdb313400480af20 100644 |
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
@@ -81,7 +81,7 @@ class TestAutofillPopupController : public AutofillPopupControllerImpl { |
} |
// Making protected functions public for testing |
- void SetPopupBounds(const gfx::Rect& bounds) { |
+ void SetPopupBounds(const gfx::RectF& bounds) { |
AutofillPopupControllerImpl::SetPopupBounds(bounds); |
} |
const std::vector<string16>& names() const { |
@@ -111,7 +111,7 @@ class TestAutofillPopupController : public AutofillPopupControllerImpl { |
void DoHide() { |
AutofillPopupControllerImpl::Hide(); |
} |
- const gfx::Rect& popup_bounds() const { |
+ const gfx::RectF& popup_bounds() const { |
return AutofillPopupControllerImpl::popup_bounds(); |
} |
const gfx::RectF& element_bounds() const { |
@@ -206,7 +206,7 @@ class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness { |
TEST_F(AutofillPopupControllerUnitTest, SetBounds) { |
// Ensure the popup size can be set and causes a redraw. |
- gfx::Rect popup_bounds(10, 10, 100, 100); |
+ gfx::RectF popup_bounds(10, 10, 100, 100); |
EXPECT_CALL(*autofill_popup_controller_, |
UpdateBoundsAndRedrawPopup()); |
@@ -576,41 +576,41 @@ TEST_F(AutofillPopupControllerUnitTest, GrowPopupInSpace) { |
// Store the possible element bounds and the popup bounds they should result |
// in. |
std::vector<gfx::RectF> element_bounds; |
- std::vector<gfx::Rect> expected_popup_bounds; |
+ std::vector<gfx::RectF> expected_popup_bounds; |
// The popup grows down and to the right. |
element_bounds.push_back(gfx::RectF(0, 0, 0, 0)); |
expected_popup_bounds.push_back( |
- gfx::Rect(0, 0, desired_width, desired_height)); |
+ gfx::RectF(0, 0, desired_width, desired_height)); |
// The popup grows down and to the left. |
element_bounds.push_back(gfx::RectF(2 * desired_width, 0, 0, 0)); |
expected_popup_bounds.push_back( |
- gfx::Rect(desired_width, 0, desired_width, desired_height)); |
+ gfx::RectF(desired_width, 0, desired_width, desired_height)); |
// The popup grows up and to the right. |
element_bounds.push_back(gfx::RectF(0, 2 * desired_height, 0, 0)); |
expected_popup_bounds.push_back( |
- gfx::Rect(0, desired_height, desired_width, desired_height)); |
+ gfx::RectF(0, desired_height, desired_width, desired_height)); |
// The popup grows up and to the left. |
element_bounds.push_back( |
gfx::RectF(2 * desired_width, 2 * desired_height, 0, 0)); |
expected_popup_bounds.push_back( |
- gfx::Rect(desired_width, desired_height, desired_width, desired_height)); |
+ gfx::RectF(desired_width, desired_height, desired_width, desired_height)); |
// The popup would be partial off the top and left side of the screen. |
element_bounds.push_back( |
gfx::RectF(-desired_width / 2, -desired_height / 2, 0, 0)); |
expected_popup_bounds.push_back( |
- gfx::Rect(0, 0, desired_width, desired_height)); |
+ gfx::RectF(0, 0, desired_width, desired_height)); |
// The popup would be partially off the bottom and the right side of |
// the screen. |
element_bounds.push_back( |
gfx::RectF(desired_width * 1.5, desired_height * 1.5, 0, 0)); |
expected_popup_bounds.push_back( |
- gfx::Rect((desired_width + 1) / 2, (desired_height + 1) / 2, |
+ gfx::RectF((desired_width + 1) / 2, (desired_height + 1) / 2, |
desired_width, desired_height)); |
for (size_t i = 0; i < element_bounds.size(); ++i) { |