Remove the singleton instance get/delete methods from RootWindow (yay)

ui/aura/test/aura_test_base.h

 // 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.
 
 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
 #define UI_AURA_TEST_AURA_TEST_BASE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/basictypes.h"
@@ skipping 12 matching lines @@
   AuraTestBase();
   virtual ~AuraTestBase();
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   void RunAllPendingInMessageLoop();
 
-  RootWindow* root_window() { return root_window_; }
+  RootWindow* root_window() { return root_window_.get(); }
 
  private:
   AuraTestHelper helper_;
-  RootWindow* root_window_;
+  scoped_ptr<RootWindow> root_window_;
   scoped_ptr<TestStackingClient> stacking_client_;
 
   DISALLOW_COPY_AND_ASSIGN(AuraTestBase);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_AURA_TEST_BASE_H_