Revert of Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate.

content/browser/renderer_host/render_widget_host_view_aura.h

Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 43d33361f6c902125a0b6d68daf49b321367405a..bc2ad37a2f858a18c073c158fe2d2c3e3c8ef49d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -41,7 +41,6 @@
 #include "ui/gfx/rect.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/activation_delegate.h"
-#include "ui/wm/public/cursor_delegate.h"
 
 namespace aura {
 class WindowTracker;
@@ -95,7 +94,6 @@
       public aura::client::ActivationChangeObserver,
       public aura::client::FocusChangeObserver,
       public aura::client::CursorClientObserver,
-      public wm::CursorDelegate,
       public ImageTransportFactoryObserver,
       public BrowserAccessibilityDelegate,
       public SoftwareFrameManagerClient,
@@ -288,6 +286,7 @@
   virtual gfx::Size GetMaximumSize() const OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
                                const gfx::Rect& new_bounds) OVERRIDE;
+  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
   virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
   virtual bool ShouldDescendIntoChildForEventHandling(
       aura::Window* child,
@@ -320,9 +319,6 @@
 
   // Overridden from aura::client::CursorClientObserver:
   virtual void OnCursorVisibilityChanged(bool is_visible) OVERRIDE;
-
-  // Overridden from wm::CursorDelegate:
-  virtual gfx::NativeCursor GetCursorForPoint(const gfx::Point& point) OVERRIDE;
 
   // Overridden from aura::client::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* gained_focus,