Fix DesktopWindowTreeHostX11Test.Shape on Unity

ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include <X11/extensions/shape.h>
 #include <X11/Xlib.h>
 
 // Get rid of X11 macros which conflict with gtest.
 #undef Bool
 #undef None
 
 #include "base/memory/scoped_ptr.h"
+#include "base/run_loop.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 157 matching lines @@
                             int x,
                             int y) {
   gfx::Point point(x, y);
   for (size_t i = 0; i < shape_rects.size(); ++i) {
     if (shape_rects[i].Contains(point))
       return true;
   }
   return false;
 }
 
+// Flush the message loop.
+void RunAllPendingInMessageLoop() {
+  base::RunLoop run_loop;
+  run_loop.RunUntilIdle();
+}
+
 }  // namespace
 
 class DesktopWindowTreeHostX11Test : public ViewsTestBase {
  public:
   DesktopWindowTreeHostX11Test() {
   }
   virtual ~DesktopWindowTreeHostX11Test() {
   }
 
   virtual void SetUp() override {
@@ skipping 54 matching lines @@
 
   if (ui::WmSupportsHint(ui::GetAtom("_NET_WM_STATE_MAXIMIZED_VERT"))) {
     // The shape should be changed to a rectangle which fills the entire screen
     // when |widget1| is maximized.
     {
       WMStateWaiter waiter(xid1, "_NET_WM_STATE_MAXIMIZED_VERT", true);
       widget1->Maximize();
       waiter.Wait();
     }
 
+    // Ensure that the task which is posted when a window is resized is run.
+    RunAllPendingInMessageLoop();
+
     // xvfb does not support Xrandr so we cannot check the maximized window's
     // bounds.
     gfx::Rect maximized_bounds;
     ui::GetWindowRect(xid1, &maximized_bounds);
 
     shape_rects = GetShapeRects(xid1);
     ASSERT_FALSE(shape_rects.empty());
     EXPECT_TRUE(ShapeRectContainsPoint(shape_rects,
                                        maximized_bounds.width() - 1,
                                        5));
@@ skipping 176 matching lines @@
         SubstructureRedirectMask | SubstructureNotifyMask,
         &xevent);
 
     WMStateWaiter waiter(xid, "_NET_WM_STATE_FOCUSED", true);
     waiter.Wait();
   }
   EXPECT_TRUE(widget.GetNativeWindow()->IsVisible());
 }
 
 }  // namespace views