Aura: Resize locks with --ui-enable-threaded-compositing

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 cd5e559dc9366173ce95faaa731107c7f982e15a..cc6ecb58adb0f63b8fec64fcde388be8c05e0819 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -22,15 +22,12 @@
 #include "ui/gfx/rect.h"
 #include "webkit/glue/webcursor.h"
 
-namespace aura {
-class CompositorLock;
-}
-
 namespace gfx {
 class Canvas;
 }
 
 namespace ui {
+class CompositorLock;
 class InputMethod;
 class Texture;
 }
@@ -372,7 +369,7 @@ class RenderWidgetHostViewAura
   std::vector<linked_ptr<ResizeLock> > locks_pending_draw_;
 
   // This lock is for waiting for a front surface to become available to draw.
-  scoped_refptr<aura::CompositorLock> released_front_lock_;
+  scoped_refptr<ui::CompositorLock> released_front_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };