Fix some views unittests on desktop Linux.

ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc

 // Copyright 2013 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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ skipping 16 matching lines @@
   params.parent = window.get();
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.native_widget = new DesktopNativeWidgetAura(&widget);
   widget.Init(params);
 }
 
 // Verifies that the AURA windows making up a widget instance have the correct
 // bounds after the widget is resized.
 TEST_F(DesktopNativeWidgetAuraTest, DesktopAuraWindowSizeTest) {
   Widget widget;
+
+  // On Linux we test this with popup windows because the WM may ignore the size
+  // suggestion for normal windows.
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  Widget::InitParams init_params =
+      CreateParams(Widget::InitParams::TYPE_POPUP);
+#else
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+#endif
+
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   init_params.native_widget = new DesktopNativeWidgetAura(&widget);
   widget.Init(init_params);
+
+  gfx::Rect bounds(0, 0, 100, 100);
+  widget.SetBounds(bounds);
+  widget.Show();
+
+  EXPECT_EQ(bounds.ToString(),
+            widget.GetNativeView()->GetRootWindow()->bounds().ToString());
+  EXPECT_EQ(bounds.ToString(), widget.GetNativeView()->bounds().ToString());
+  EXPECT_EQ(bounds.ToString(),
+            widget.GetNativeView()->parent()->bounds().ToString());
+
+  gfx::Rect new_bounds(0, 0, 200, 200);
+  widget.SetBounds(new_bounds);
+  EXPECT_EQ(new_bounds.ToString(),
+            widget.GetNativeView()->GetRootWindow()->bounds().ToString());
+  EXPECT_EQ(new_bounds.ToString(), widget.GetNativeView()->bounds().ToString());
+  EXPECT_EQ(new_bounds.ToString(),
+            widget.GetNativeView()->parent()->bounds().ToString());
+}
+
+// Verifies that the AURA windows making up a widget instance have the correct

[Daniel Erat, 2014/05/23 14:53:59]

nit: s/AURA/Aura/

[Evan Stade, 2014/05/23 15:30:32]

oh whoops, I meant to remove this test which is a duplicate of the above.

+// bounds after the widget is resized.
+TEST_F(DesktopNativeWidgetAuraTest, DesktopAuraWindowSizeTestPopup) {
+  Widget widget;
+  Widget::InitParams init_params =
+      CreateParams(Widget::InitParams::TYPE_POPUP);
+  init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  init_params.native_widget = new DesktopNativeWidgetAura(&widget);
+  widget.Init(init_params);
 
   gfx::Rect bounds(0, 0, 100, 100);
   widget.SetBounds(bounds);
   widget.Show();
 
   EXPECT_EQ(bounds.ToString(),
             widget.GetNativeView()->GetRootWindow()->bounds().ToString());
   EXPECT_EQ(bounds.ToString(), widget.GetNativeView()->bounds().ToString());
   EXPECT_EQ(bounds.ToString(),
             widget.GetNativeView()->parent()->bounds().ToString());
@@ skipping 158 matching lines @@
 
   // Post a task that terminates the nested loop and destroyes the widget. This
   // task will be executed from the nested loop initiated with the call to
   // |RunWithDispatcher()| below.
   message_loop()->PostTask(FROM_HERE,
       base::Bind(&QuitNestedLoopAndCloseWidget, base::Passed(&widget), client));
   client->RunWithDispatcher(NULL);
 }
 
 }  // namespace views