Revert 244005 "Remove SetHostSize/Bounds from RootWindow in favo..."

trunk/src/ui/views/widget/native_widget_aura_unittest.cc

 // Copyright (c) 2012 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/native_widget_aura.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 22 matching lines @@
 }
 
 class NativeWidgetAuraTest : public ViewsTestBase {
  public:
   NativeWidgetAuraTest() {}
   virtual ~NativeWidgetAuraTest() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     ViewsTestBase::SetUp();
-    dispatcher()->host()->SetBounds(gfx::Rect(640, 480));
+    root_window()->SetBounds(gfx::Rect(0, 0, 640, 480));
+    dispatcher()->SetHostSize(gfx::Size(640, 480));
   }
 
  protected:
   aura::Window* root_window() { return GetContext(); }
   aura::RootWindow* dispatcher() { return root_window()->GetDispatcher(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAuraTest);
 };
 
@@ skipping 341 matching lines @@
   scoped_ptr<Widget> widget(new Widget());
   NativeWidgetAura* window = Init(parent.get(), widget.get());
   window->Show();
   window->Close();
   base::MessageLoop::current()->RunUntilIdle();
   widget->GetNativeTheme();  // Shouldn't crash.
 }
 
 }  // namespace
 }  // namespace views