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

ui/aura/root_window.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_ROOT_WINDOW_H_
 #define UI_AURA_ROOT_WINDOW_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 32 matching lines @@
 class TouchEvent;
 class GestureEvent;
 
 // RootWindow is responsible for hosting a set of windows.
 class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
                                public ui::CompositorObserver,
                                public Window,
                                public internal::FocusManager,
                                public ui::LayerAnimationObserver {
  public:
-  static RootWindow* GetInstance();
-  static void DeleteInstance();
+  RootWindow();
+  virtual ~RootWindow();
 
   static void set_use_fullscreen_host_window(bool use_fullscreen) {
     use_fullscreen_host_window_ = use_fullscreen;
   }
   static bool use_fullscreen_host_window() {
     return use_fullscreen_host_window_;
   }
 
   static void set_hide_host_cursor(bool hide) {
     hide_host_cursor_ = hide;
@@ skipping 128 matching lines @@
 
   // Overridden from ui::CompositorDelegate:
   virtual void ScheduleDraw() OVERRIDE;
 
   // Overridden from ui::CompositorObserver:
   virtual void OnCompositingEnded(ui::Compositor*) OVERRIDE;
 
  private:
   friend class Window;
 
-  RootWindow();
-  virtual ~RootWindow();
-
   // Called whenever the mouse moves, tracks the current |mouse_moved_handler_|,
   // sending exited and entered events as its value changes.
   void HandleMouseMoved(const MouseEvent& event, Window* target);
 
   // Called whenever the |capture_window_| changes.
   // Sends capture changed events to event filters for old capture window.
   void HandleMouseCaptureChanged(Window* old_capture_window);
 
   bool ProcessMouseEvent(Window* target, MouseEvent* event);
   bool ProcessKeyEvent(Window* target, KeyEvent* event);
@@ skipping 97 matching lines @@
   bool synthesize_mouse_move_;
   bool waiting_on_compositing_end_;
   bool draw_on_compositing_end_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_H_