Chromium Code Reviews| Index: content/renderer/render_view_browsertest.cc |
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc |
| index 1ec29e2e4bb415146c2d72df96d25e351d18f0db..7d6f3cc55db0c7dcb3be88ed1b45824f5a2d1ae7 100644 |
| --- a/content/renderer/render_view_browsertest.cc |
| +++ b/content/renderer/render_view_browsertest.cc |
| @@ -365,10 +365,6 @@ class RenderViewImplTest : public RenderViewTest { |
| return view()->preferred_size_; |
| } |
| - void SetZoomLevel(double level) { |
| - view()->OnSetZoomLevelForView(false, level); |
| - } |
| - |
| private: |
| scoped_ptr<MockKeyboard> mock_keyboard_; |
| }; |
| @@ -2101,7 +2097,11 @@ TEST_F(RenderViewImplTest, PreferredSizeZoomed) { |
| gfx::Size size = GetPreferredSize(); |
| EXPECT_EQ(gfx::Size(400, 400), size); |
| - SetZoomLevel(ZoomFactorToZoomLevel(2.0)); |
| + double zoom_level = ZoomFactorToZoomLevel(2.0); |
| + // We must call webview()->setZoomLevel() separately, since SetZoomLevel() |
| + // now just notifies RenderViewObservers. |
| + view()->webview()->setZoomLevel(zoom_level); |
|
alexmos
2016/04/07 23:48:08
Is this change still necessary? You've reverted S
wjmaclean
2016/04/08 20:13:29
Done.
|
| + |
| size = GetPreferredSize(); |
| EXPECT_EQ(gfx::Size(800, 800), size); |
| } |