Revert 271468 "Revert of [Refactor] Consolidate the logic for wh..."

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

Index: trunk/src/ui/views/widget/native_widget_aura_unittest.cc
===================================================================
--- trunk/src/ui/views/widget/native_widget_aura_unittest.cc	(revision 271508)
+++ trunk/src/ui/views/widget/native_widget_aura_unittest.cc	(working copy)
@@ -432,9 +432,9 @@
   parent->Init(aura::WINDOW_LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(0, 0, 480, 320));
   scoped_ptr<Widget> widget(new Widget());
-  NativeWidgetAura* window = Init(parent.get(), widget.get());
-  window->Show();
-  window->Close();
+  Init(parent.get(), widget.get());
+  widget->Show();
+  widget->Close();
   base::MessageLoop::current()->RunUntilIdle();
   widget->GetNativeTheme();  // Shouldn't crash.
 }