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

ui/views/test/views_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_VIEWS_TEST_VIEWS_TEST_BASE_H_
 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 35 matching lines @@
   void set_views_delegate(TestViewsDelegate* views_delegate) {
     views_delegate_.reset(views_delegate);
   }
 
   MessageLoop* message_loop() { return &message_loop_; }
 
  private:
   MessageLoopForUI message_loop_;
   scoped_ptr<TestViewsDelegate> views_delegate_;
 #if defined(USE_AURA)
+  scoped_ptr<aura::RootWindow> root_window_;
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
   scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
   scoped_ptr<ui::InputMethod> test_input_method_;
-  aura::RootWindow* root_window_;
 #endif
   bool setup_called_;
   bool teardown_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_