Fixes two bugs related to constrained windows:

ui/views/widget/native_widget_aura_unittest.cc

Index: ui/views/widget/native_widget_aura_unittest.cc
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index d589f4d96e1bce7c446e58f3a6cd47083ebfc852..a516e1435bbc2344cd8010aa4735e74e9d329ad2 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -81,7 +81,7 @@ TEST_F(NativeWidgetAuraTest, CenterWindowSmallParent) {
   parent->Init(ui::LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(0, 0, 480, 320));
   scoped_ptr<Widget> widget(new Widget());
-  NativeWidgetAura* window  = Init(parent.get(), widget.get());
+  NativeWidgetAura* window = Init(parent.get(), widget.get());
 
   window->CenterWindow(gfx::Size(100, 100));
   EXPECT_EQ(gfx::Rect( (480 - 100) / 2,
@@ -91,6 +91,22 @@ TEST_F(NativeWidgetAuraTest, CenterWindowSmallParent) {
   widget->CloseNow();
 }
 
+// Verifies CenterWindow() constrains to parent size.
+TEST_F(NativeWidgetAuraTest, CenterWindowSmallParentNotAtOrigin) {
+  // Make a parent window smaller than the host represented by rootwindow and
+  // offset it slightly from the origin.
+  scoped_ptr<aura::Window> parent(new aura::Window(NULL));
+  parent->Init(ui::LAYER_NOT_DRAWN);
+  parent->SetBounds(gfx::Rect(20, 40, 480, 320));
+  scoped_ptr<Widget> widget(new Widget());
+  NativeWidgetAura* window = Init(parent.get(), widget.get());
+  window->CenterWindow(gfx::Size(500, 600));
+
+  // |window| should be no bigger than |parent|.
+  EXPECT_EQ("20,40 480x320", window->GetNativeWindow()->bounds().ToString());
+  widget->CloseNow();
+}
+
 // Used by ShowMaximizedDoesntBounceAround. See it for details.
 class TestLayoutManager : public aura::LayoutManager {
  public: