Fix virtual keyboard.

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index fc2ee89021e815184a7be8689ba53ada02a8b90d..9af4f1487233215ab52d941f2635bfef3068b8d7 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -169,9 +169,7 @@ class FakeRenderWidgetHostViewAura : public RenderWidgetHostViewAura {
   }
 
   virtual bool ShouldCreateResizeLock() OVERRIDE {
-    gfx::Size desired_size = window()->bounds().size();
-    return desired_size !=
-           GetDelegatedFrameHost()->CurrentFrameSizeInDIPForTesting();
+    return GetDelegatedFrameHost()->ShouldCreateResizeLockForTesting();
   }
 
   virtual void RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request)
@@ -988,7 +986,6 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {
   // Lock the compositor. Now we should drop frames.
   view_rect = gfx::Rect(150, 150);
   view_->SetSize(view_rect.size());
-  view_->GetDelegatedFrameHost()->MaybeCreateResizeLock();

[piman, 2014/05/16 23:33:24]

This is implicit in SetSize.

 
   // This frame is dropped.
   gfx::Rect dropped_damage_rect_1(10, 20, 30, 40);
@@ -1025,6 +1022,22 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {
   view_->RunOnCompositingDidCommit();
 
 
+  // Resize to something empty.
+  view_rect = gfx::Rect(100, 0);
+  view_->SetSize(view_rect.size());
+
+  // We're never expecting empty frames, resize to something non-empty.
+  view_rect = gfx::Rect(100, 100);
+  view_->SetSize(view_rect.size());
+
+  // This frame should not be dropped.
+  EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));
+  view_->OnSwapCompositorFrame(
+      0, MakeDelegatedFrame(1.f, view_rect.size(), view_rect));
+  testing::Mock::VerifyAndClearExpectations(&observer);
+  view_->RunOnCompositingDidCommit();
+
+

[danakj, 2014/05/20 18:20:53]

extra whitespace

[piman, 2014/05/20 18:53:05]

Done.

   view_->window_->RemoveObserver(&observer);
 }