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

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 414 matching lines @@
   EXPECT_TRUE(window->GetProperty(aura::client::kDrawAttentionKey));
   widget->Activate();
   EXPECT_FALSE(window->GetProperty(aura::client::kDrawAttentionKey));
 }
 
 TEST_F(NativeWidgetAuraTest, NoCrashOnThemeAfterClose) {
   scoped_ptr<aura::Window> parent(new aura::Window(NULL));
   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.
 }
 
 // Used to track calls to WidgetDelegate::OnWidgetMove().
 class MoveTestWidgetDelegate : public WidgetDelegateView {
  public:
   MoveTestWidgetDelegate() : got_move_(false) {}
   virtual ~MoveTestWidgetDelegate() {}
 
@@ skipping 24 matching lines @@
   delegate->ClearGotMove();
   // Simulate a maximize with animation.
   delete widget->GetNativeView()->RecreateLayer().release();
   widget->SetBounds(gfx::Rect(0, 0, 500, 500));
   EXPECT_TRUE(delegate->got_move());
   widget->CloseNow();
 }
 
 }  // namespace
 }  // namespace views