Revert: [Refactor] Consolidate the logic for whether a widget can be activated. This is a first ste

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 80bdf9efe19cb5c8184d6cf293cd97540cdde1bf..6e47dbc1cd2cbabf129305d2cf7c1fbfbc43f217 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -432,9 +432,9 @@ TEST_F(NativeWidgetAuraTest, NoCrashOnThemeAfterClose) {
   parent->Init(aura::WINDOW_LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(0, 0, 480, 320));
   scoped_ptr<Widget> widget(new Widget());
-  Init(parent.get(), widget.get());
-  widget->Show();
-  widget->Close();
+  NativeWidgetAura* window = Init(parent.get(), widget.get());
+  window->Show();
+  window->Close();
   base::MessageLoop::current()->RunUntilIdle();
   widget->GetNativeTheme();  // Shouldn't crash.
 }