Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness

> Add the UI compositor to the Mac build
> 
> Move the bulk of the files in content/browser/aura to
> content/browser/compositor, since they're not aura-specific.
> 
> Build all of those files in the Mac build, and add ui/compositor
> to the dependencies of the Mac build. These files will soon only
> be excluded from the Android build.
> 
> BUG=314190
> 
> Review URL: https://codereview.chromium.org/137893007

TBR=ccameron@chromium.org
BUG=335083

Review URL: https://codereview.chromium.org/137853019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245195 0039d316-1c4b-4281-b951-d872f2087c98

42 files changed, 158 insertions, 176 deletions

diff --git a/WATCHLISTS b/WATCHLISTS
index d02807e..c5e2ec2 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -64,8 +64,7 @@
     'aura_compositor': {
       'filepath':
         'ui/compositor/' \
-        '|content/browser/compositor/' \
-        '|content/browser/renderer_host/compositor_resize_lock_aura' \
+       	'|content/browser/aura/' \
         '|content/browser/renderer_host/render_widget_host_view_aura' \
         '|content/browser/renderer_host/render_widget_host_view_browsertest' \
         '|content/common/gpu/client/' \
diff --git a/content/browser/compositor/OWNERS b/content/browser/aura/OWNERS
index 3b61cda..3b61cda 100644
--- a/content/browser/compositor/OWNERS
+++ b/content/browser/aura/OWNERS
diff --git a/content/browser/compositor/browser_compositor_output_surface.cc b/content/browser/aura/browser_compositor_output_surface.cc
index d3ceb2a..2125d38 100644
--- a/content/browser/compositor/browser_compositor_output_surface.cc
+++ b/content/browser/aura/browser_compositor_output_surface.cc
@@ -1,15 +1,15 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#include "content/browser/compositor/browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
-#include "content/browser/compositor/reflector_impl.h"
+#include "content/browser/aura/reflector_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
diff --git a/content/browser/compositor/browser_compositor_output_surface.h b/content/browser/aura/browser_compositor_output_surface.h
index de7ea9b..79f757a 100644
--- a/content/browser/compositor/browser_compositor_output_surface.h
+++ b/content/browser/aura/browser_compositor_output_surface.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
-#define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#ifndef CONTENT_BROWSER_AURA_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CONTENT_BROWSER_AURA_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include "base/id_map.h"
 #include "base/memory/weak_ptr.h"
@@ -71,4 +71,4 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#endif  // CONTENT_BROWSER_AURA_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
diff --git a/content/browser/compositor/browser_compositor_output_surface_proxy.cc b/content/browser/aura/browser_compositor_output_surface_proxy.cc
index d95c9b0..e86e5b8 100644
--- a/content/browser/compositor/browser_compositor_output_surface_proxy.cc
+++ b/content/browser/aura/browser_compositor_output_surface_proxy.cc
@@ -1,11 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
+#include "content/browser/aura/browser_compositor_output_surface_proxy.h"
 
 #include "base/bind.h"
-#include "content/browser/compositor/browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/common/gpu/gpu_messages.h"
 
diff --git a/content/browser/compositor/browser_compositor_output_surface_proxy.h b/content/browser/aura/browser_compositor_output_surface_proxy.h
index 644516e..0c5ffcd 100644
--- a/content/browser/compositor/browser_compositor_output_surface_proxy.h
+++ b/content/browser/aura/browser_compositor_output_surface_proxy.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_PROXY_H_
-#define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_PROXY_H_
+#ifndef CONTENT_BROWSER_AURA_BROWSER_COMPOSITOR_OUTPUT_SURFACE_PROXY_H_
+#define CONTENT_BROWSER_AURA_BROWSER_COMPOSITOR_OUTPUT_SURFACE_PROXY_H_
 
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
@@ -48,4 +48,4 @@ class CONTENT_EXPORT BrowserCompositorOutputSurfaceProxy
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_PROXY_H_
+#endif  // CONTENT_BROWSER_AURA_BROWSER_COMPOSITOR_OUTPUT_SURFACE_PROXY_H_
diff --git a/content/browser/renderer_host/compositor_resize_lock_aura.cc b/content/browser/aura/compositor_resize_lock.cc
index 53c2c5b..a0f17aa 100644
--- a/content/browser/renderer_host/compositor_resize_lock_aura.cc
+++ b/content/browser/aura/compositor_resize_lock.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/renderer_host/compositor_resize_lock_aura.h"
+#include "content/browser/aura/compositor_resize_lock.h"
 
 #include "base/debug/trace_event.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/compositor_resize_lock_aura.h b/content/browser/aura/compositor_resize_lock.h
index 6963ac2..51787e4 100644
--- a/content/browser/renderer_host/compositor_resize_lock_aura.h
+++ b/content/browser/aura/compositor_resize_lock.h
@@ -1,14 +1,14 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_
-#define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_
+#ifndef CONTENT_BROWSER_AURA_RESIZE_LOCK_AURA_H_
+#define CONTENT_BROWSER_AURA_RESIZE_LOCK_AURA_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
-#include "content/browser/compositor/resize_lock.h"
+#include "content/browser/aura/resize_lock.h"
 
 namespace aura { class RootWindow; }
 
@@ -43,4 +43,4 @@ class CompositorResizeLock : public ResizeLock {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_
+#endif  // CONTENT_BROWSER_AURA_RESIZE_LOCK_AURA_H_
diff --git a/content/browser/compositor/gpu_browser_compositor_output_surface.cc b/content/browser/aura/gpu_browser_compositor_output_surface.cc
index 17c4780..8c37780 100644
--- a/content/browser/compositor/gpu_browser_compositor_output_surface.cc
+++ b/content/browser/aura/gpu_browser_compositor_output_surface.cc
@@ -1,11 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
+#include "content/browser/aura/gpu_browser_compositor_output_surface.h"
 
 #include "cc/output/compositor_frame.h"
-#include "content/browser/compositor/reflector_impl.h"
+#include "content/browser/aura/reflector_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
diff --git a/content/browser/compositor/gpu_browser_compositor_output_surface.h b/content/browser/aura/gpu_browser_compositor_output_surface.h
index c677839..76b9724 100644
--- a/content/browser/compositor/gpu_browser_compositor_output_surface.h
+++ b/content/browser/aura/gpu_browser_compositor_output_surface.h
@@ -1,11 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
-#define CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#ifndef CONTENT_BROWSER_AURA_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CONTENT_BROWSER_AURA_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 
-#include "content/browser/compositor/browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface.h"
 
 namespace content {
 
@@ -33,4 +33,4 @@ class GpuBrowserCompositorOutputSurface
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#endif  // CONTENT_BROWSER_AURA_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/aura/gpu_process_transport_factory.cc
index b6e8cbf..8250d47 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/aura/gpu_process_transport_factory.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#include "content/browser/compositor/gpu_process_transport_factory.h"
+#include "content/browser/aura/gpu_process_transport_factory.h"
 
 #include <string>
 
@@ -13,11 +13,11 @@
 #include "base/metrics/histogram.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
-#include "content/browser/compositor/browser_compositor_output_surface.h"
-#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
-#include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
-#include "content/browser/compositor/reflector_impl.h"
-#include "content/browser/compositor/software_browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface_proxy.h"
+#include "content/browser/aura/gpu_browser_compositor_output_surface.h"
+#include "content/browser/aura/reflector_impl.h"
+#include "content/browser/aura/software_browser_compositor_output_surface.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
@@ -36,12 +36,12 @@
 #include "ui/gfx/size.h"
 
 #if defined(OS_WIN)
-#include "content/browser/compositor/software_output_device_win.h"
+#include "content/browser/aura/software_output_device_win.h"
 #include "ui/surface/accelerated_surface_win.h"
 #elif defined(USE_OZONE)
-#include "content/browser/compositor/software_output_device_ozone.h"
+#include "content/browser/aura/software_output_device_ozone.h"
 #elif defined(USE_X11)
-#include "content/browser/compositor/software_output_device_x11.h"
+#include "content/browser/aura/software_output_device_x11.h"
 #endif
 
 using cc::ContextProvider;
diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/aura/gpu_process_transport_factory.h
index 6139f21..4ae89fe 100644
--- a/content/browser/compositor/gpu_process_transport_factory.h
+++ b/content/browser/aura/gpu_process_transport_factory.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
-#define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
+#ifndef CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_
+#define CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_
 
 #include <map>
 
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "ui/compositor/compositor.h"
 
 namespace content {
@@ -92,4 +92,4 @@ class GpuProcessTransportFactory
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
+#endif  // CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_
diff --git a/content/browser/compositor/image_transport_factory.cc b/content/browser/aura/image_transport_factory.cc
index becdc68..4a20e7d 100644
--- a/content/browser/compositor/image_transport_factory.cc
+++ b/content/browser/aura/image_transport_factory.cc
@@ -1,11 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 
-#include "content/browser/compositor/gpu_process_transport_factory.h"
-#include "content/browser/compositor/no_transport_image_transport_factory.h"
+#include "content/browser/aura/gpu_process_transport_factory.h"
+#include "content/browser/aura/no_transport_image_transport_factory.h"
 #include "ui/compositor/compositor.h"
 
 namespace content {
diff --git a/content/browser/compositor/image_transport_factory.h b/content/browser/aura/image_transport_factory.h
index 5901125..b2c807f 100644
--- a/content/browser/compositor/image_transport_factory.h
+++ b/content/browser/aura/image_transport_factory.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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 CONTENT_BROWSER_COMPOSITOR_IMAGE_TRANSPORT_FACTORY_H_
-#define CONTENT_BROWSER_COMPOSITOR_IMAGE_TRANSPORT_FACTORY_H_
+#ifndef CONTENT_BROWSER_AURA_IMAGE_TRANSPORT_FACTORY_H_
+#define CONTENT_BROWSER_AURA_IMAGE_TRANSPORT_FACTORY_H_
 
 #include <string>
 
@@ -91,4 +91,4 @@ class CONTENT_EXPORT ImageTransportFactory {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_IMAGE_TRANSPORT_FACTORY_H_
+#endif  // CONTENT_BROWSER_AURA_IMAGE_TRANSPORT_FACTORY_H_
diff --git a/content/browser/compositor/image_transport_factory_browsertest.cc b/content/browser/aura/image_transport_factory_browsertest.cc
index 8e53b42..bf770a7 100644
--- a/content/browser/compositor/image_transport_factory_browsertest.cc
+++ b/content/browser/aura/image_transport_factory_browsertest.cc
@@ -1,10 +1,10 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
 #include "base/run_loop.h"
 #include "cc/output/context_provider.h"
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/test/content_browser_test.h"
 #include "gpu/GLES2/gl2extchromium.h"
diff --git a/content/browser/compositor/no_transport_image_transport_factory.cc b/content/browser/aura/no_transport_image_transport_factory.cc
index f278e49..010500c 100644
--- a/content/browser/compositor/no_transport_image_transport_factory.cc
+++ b/content/browser/aura/no_transport_image_transport_factory.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#include "content/browser/compositor/no_transport_image_transport_factory.h"
+#include "content/browser/aura/no_transport_image_transport_factory.h"
 
 #include "cc/output/context_provider.h"
 #include "content/common/gpu/client/gl_helper.h"
diff --git a/content/browser/compositor/no_transport_image_transport_factory.h b/content/browser/aura/no_transport_image_transport_factory.h
index c4c2c20..da2a1f4 100644
--- a/content/browser/compositor/no_transport_image_transport_factory.h
+++ b/content/browser/aura/no_transport_image_transport_factory.h
@@ -1,12 +1,12 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 CONTENT_BROWSER_COMPOSITOR_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
-#define CONTENT_BROWSER_COMPOSITOR_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
+#ifndef CONTENT_BROWSER_AURA_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
+#define CONTENT_BROWSER_AURA_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 
 namespace cc {
 class ContextProvider;
@@ -44,4 +44,4 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
+#endif  // CONTENT_BROWSER_AURA_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
diff --git a/content/browser/compositor/owned_mailbox.cc b/content/browser/aura/owned_mailbox.cc
index 06a60e4..5994903 100644
--- a/content/browser/compositor/owned_mailbox.cc
+++ b/content/browser/aura/owned_mailbox.cc
@@ -1,11 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/compositor/owned_mailbox.h"
+#include "content/browser/aura/owned_mailbox.h"
 
 #include "base/logging.h"
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "content/common/gpu/client/gl_helper.h"
 
 namespace content {
diff --git a/content/browser/compositor/owned_mailbox.h b/content/browser/aura/owned_mailbox.h
index a574ae4..3c0c0ca 100644
--- a/content/browser/compositor/owned_mailbox.h
+++ b/content/browser/aura/owned_mailbox.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
 #include "base/memory/ref_counted.h"
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "gpu/command_buffer/common/mailbox.h"
 
 namespace content {
diff --git a/content/browser/compositor/reflector_impl.cc b/content/browser/aura/reflector_impl.cc
index b4ddd9f..6d8e89d 100644
--- a/content/browser/compositor/reflector_impl.cc
+++ b/content/browser/aura/reflector_impl.cc
@@ -1,12 +1,12 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#include "content/browser/compositor/reflector_impl.h"
+#include "content/browser/aura/reflector_impl.h"
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "content/browser/compositor/browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "ui/compositor/layer.h"
 
diff --git a/content/browser/compositor/reflector_impl.h b/content/browser/aura/reflector_impl.h
index c5df1e2..e5b5128 100644
--- a/content/browser/compositor/reflector_impl.h
+++ b/content/browser/aura/reflector_impl.h
@@ -1,14 +1,14 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 CONTENT_BROWSER_COMPOSITOR_REFLECTOR_IMPL_H_
-#define CONTENT_BROWSER_COMPOSITOR_REFLECTOR_IMPL_H_
+#ifndef CONTENT_BROWSER_AURA_REFLECTOR_IMPL_H_
+#define CONTENT_BROWSER_AURA_REFLECTOR_IMPL_H_
 
 #include "base/id_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "ui/compositor/reflector.h"
 #include "ui/gfx/size.h"
 
@@ -122,4 +122,4 @@ class ReflectorImpl : public ImageTransportFactoryObserver,
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_REFLECTOR_IMPL_H_
+#endif  // CONTENT_BROWSER_AURA_REFLECTOR_IMPL_H_
diff --git a/content/browser/compositor/resize_lock.cc b/content/browser/aura/resize_lock.cc
index ddbc443..4c8cd95 100644
--- a/content/browser/compositor/resize_lock.cc
+++ b/content/browser/aura/resize_lock.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/compositor/resize_lock.h"
+#include "content/browser/aura/resize_lock.h"
 
 namespace content {
 
diff --git a/content/browser/compositor/resize_lock.h b/content/browser/aura/resize_lock.h
index 07acff3..cff9822 100644
--- a/content/browser/compositor/resize_lock.h
+++ b/content/browser/aura/resize_lock.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 CONTENT_BROWSER_COMPOSITOR_RESIZE_LOCK_H_
-#define CONTENT_BROWSER_COMPOSITOR_RESIZE_LOCK_H_
+#ifndef CONTENT_BROWSER_AURA_RESIZE_LOCK_H_
+#define CONTENT_BROWSER_AURA_RESIZE_LOCK_H_
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
@@ -34,4 +34,4 @@ class CONTENT_EXPORT ResizeLock {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_RESIZE_LOCK_H_
+#endif  // CONTENT_BROWSER_AURA_RESIZE_LOCK_H_
diff --git a/content/browser/compositor/software_browser_compositor_output_surface.cc b/content/browser/aura/software_browser_compositor_output_surface.cc
index 9dcaf24..6516f93 100644
--- a/content/browser/compositor/software_browser_compositor_output_surface.cc
+++ b/content/browser/aura/software_browser_compositor_output_surface.cc
@@ -1,15 +1,15 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/compositor/software_browser_compositor_output_surface.h"
+#include "content/browser/aura/software_browser_compositor_output_surface.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/software_output_device.h"
-#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
+#include "content/browser/aura/browser_compositor_output_surface_proxy.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/vsync_provider.h"
diff --git a/content/browser/compositor/software_browser_compositor_output_surface.h b/content/browser/aura/software_browser_compositor_output_surface.h
index 88bf9a9..79c7901 100644
--- a/content/browser/compositor/software_browser_compositor_output_surface.h
+++ b/content/browser/aura/software_browser_compositor_output_surface.h
@@ -1,12 +1,12 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
-#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#ifndef CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include "base/memory/weak_ptr.h"
-#include "content/browser/compositor/browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface.h"
 #include "content/common/content_export.h"
 #include "ui/compositor/compositor.h"
 
@@ -47,4 +47,4 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSurface
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#endif  // CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
diff --git a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc b/content/browser/aura/software_browser_compositor_output_surface_unittest.cc
index c67bb8d..14312d2 100644
--- a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
+++ b/content/browser/aura/software_browser_compositor_output_surface_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
-#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
-#include "content/browser/compositor/software_browser_compositor_output_surface.h"
+#include "content/browser/aura/browser_compositor_output_surface_proxy.h"
+#include "content/browser/aura/software_browser_compositor_output_surface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/vsync_provider.h"
diff --git a/content/browser/compositor/software_output_device_ozone.cc b/content/browser/aura/software_output_device_ozone.cc
index bafd1a9..29b322e 100644
--- a/content/browser/compositor/software_output_device_ozone.cc
+++ b/content/browser/aura/software_output_device_ozone.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/compositor/software_output_device_ozone.h"
+#include "content/browser/aura/software_output_device_ozone.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/compositor/compositor.h"
diff --git a/content/browser/compositor/software_output_device_ozone.h b/content/browser/aura/software_output_device_ozone.h
index bff10d2..d4c6554 100644
--- a/content/browser/compositor/software_output_device_ozone.h
+++ b/content/browser/aura/software_output_device_ozone.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
-#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
+#ifndef CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
+#define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
 
 #include "cc/output/software_output_device.h"
 #include "content/common/content_export.h"
@@ -38,4 +38,4 @@ class CONTENT_EXPORT SoftwareOutputDeviceOzone
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
+#endif  // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/aura/software_output_device_ozone_unittest.cc
index 1e84626..64724ab 100644
--- a/content/browser/compositor/software_output_device_ozone_unittest.cc
+++ b/content/browser/aura/software_output_device_ozone_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/software_frame_data.h"
-#include "content/browser/compositor/software_output_device_ozone.h"
+#include "content/browser/aura/software_output_device_ozone.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "ui/compositor/compositor.h"
diff --git a/content/browser/compositor/software_output_device_win.cc b/content/browser/aura/software_output_device_win.cc
index 72f2474..b6e9d78 100644
--- a/content/browser/compositor/software_output_device_win.cc
+++ b/content/browser/aura/software_output_device_win.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/compositor/software_output_device_win.h"
+#include "content/browser/aura/software_output_device_win.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/browser/compositor/software_output_device_win.h b/content/browser/aura/software_output_device_win.h
index 4362732..5518de2 100644
--- a/content/browser/compositor/software_output_device_win.h
+++ b/content/browser/aura/software_output_device_win.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
-#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
+#ifndef CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_WIN_H_
+#define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_WIN_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/output/software_output_device.h"
@@ -39,4 +39,4 @@ class SoftwareOutputDeviceWin : public cc::SoftwareOutputDevice {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
+#endif  // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_WIN_H_
diff --git a/content/browser/compositor/software_output_device_x11.cc b/content/browser/aura/software_output_device_x11.cc
index 3e376f6..51e54db 100644
--- a/content/browser/compositor/software_output_device_x11.cc
+++ b/content/browser/aura/software_output_device_x11.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/browser/compositor/software_output_device_x11.h"
+#include "content/browser/aura/software_output_device_x11.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/content/browser/compositor/software_output_device_x11.h b/content/browser/aura/software_output_device_x11.h
index 0bd07c3..799a65e 100644
--- a/content/browser/compositor/software_output_device_x11.h
+++ b/content/browser/aura/software_output_device_x11.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
-#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
+#ifndef CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
+#define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
 
 #include <X11/Xlib.h>
 
@@ -33,4 +33,4 @@ class SoftwareOutputDeviceX11 : public cc::SoftwareOutputDevice {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
+#endif  // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 5f01211..250cb36 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -63,7 +63,7 @@
 #include "ui/base/clipboard/clipboard.h"
 
 #if defined(USE_AURA)
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #endif
 
 #if defined(OS_ANDROID)
diff --git a/content/browser/renderer_host/media/desktop_capture_device_aura.cc b/content/browser/renderer_host/media/desktop_capture_device_aura.cc
index 03e9c89..3f8b66f 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_aura.cc
+++ b/content/browser/renderer_host/media/desktop_capture_device_aura.cc
@@ -8,7 +8,7 @@
 #include "base/timer/timer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "content/browser/renderer_host/media/video_capture_device_impl.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 3de0ff1..cd3abed 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -35,7 +35,7 @@
 #include "ui/gfx/screen.h"
 
 #if defined(USE_AURA)
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_screen.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 720d820..ed380e1 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -22,9 +22,9 @@
 #include "cc/trees/layer_tree_settings.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
+#include "content/browser/aura/compositor_resize_lock.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/renderer_host/backing_store_aura.h"
-#include "content/browser/renderer_host/compositor_resize_lock_aura.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_aura.h"
 #include "content/browser/renderer_host/overscroll_controller.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 37f5f4e..24599a4 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -20,8 +20,8 @@
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/resources/texture_mailbox.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
-#include "content/browser/compositor/image_transport_factory.h"
-#include "content/browser/compositor/owned_mailbox.h"
+#include "content/browser/aura/image_transport_factory.h"
+#include "content/browser/aura/owned_mailbox.h"
 #include "content/browser/renderer_host/delegated_frame_evictor.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/software_frame_manager.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 9977aaa..3349843 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -13,8 +13,8 @@
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/gl_frame_data.h"
+#include "content/browser/aura/resize_lock.h"
 #include "content/browser/browser_thread_impl.h"
-#include "content/browser/compositor/resize_lock.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/gpu_messages.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 1aacb95..612470c 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -295,6 +295,34 @@
     'browser/appcache/appcache_frontend_proxy.h',
     'browser/appcache/chrome_appcache_service.cc',
     'browser/appcache/chrome_appcache_service.h',
+    'browser/aura/browser_compositor_output_surface.cc',
+    'browser/aura/browser_compositor_output_surface.h',
+    'browser/aura/browser_compositor_output_surface_proxy.cc',
+    'browser/aura/browser_compositor_output_surface_proxy.h',
+    'browser/aura/compositor_resize_lock.cc',
+    'browser/aura/compositor_resize_lock.h',
+    'browser/aura/gpu_process_transport_factory.cc',
+    'browser/aura/gpu_process_transport_factory.h',
+    'browser/aura/image_transport_factory.cc',
+    'browser/aura/image_transport_factory.h',
+    'browser/aura/no_transport_image_transport_factory.cc',
+    'browser/aura/no_transport_image_transport_factory.h',
+    'browser/aura/owned_mailbox.h',
+    'browser/aura/owned_mailbox.cc',
+    'browser/aura/reflector_impl.cc',
+    'browser/aura/reflector_impl.h',
+    'browser/aura/resize_lock.cc',
+    'browser/aura/resize_lock.h',
+    'browser/aura/gpu_browser_compositor_output_surface.cc',
+    'browser/aura/gpu_browser_compositor_output_surface.h',
+    'browser/aura/software_browser_compositor_output_surface.cc',
+    'browser/aura/software_browser_compositor_output_surface.h',
+    'browser/aura/software_output_device_ozone.cc',
+    'browser/aura/software_output_device_ozone.h',
+    'browser/aura/software_output_device_win.cc',
+    'browser/aura/software_output_device_win.h',
+    'browser/aura/software_output_device_x11.cc',
+    'browser/aura/software_output_device_x11.h',
     'browser/browser_child_process_host_impl.cc',
     'browser/browser_child_process_host_impl.h',
     'browser/browser_context.cc',
@@ -335,32 +363,6 @@
     'browser/child_process_launcher.h',
     'browser/child_process_security_policy_impl.cc',
     'browser/child_process_security_policy_impl.h',
-    'browser/compositor/browser_compositor_output_surface.cc',
-    'browser/compositor/browser_compositor_output_surface.h',
-    'browser/compositor/browser_compositor_output_surface_proxy.cc',
-    'browser/compositor/browser_compositor_output_surface_proxy.h',
-    'browser/compositor/gpu_process_transport_factory.cc',
-    'browser/compositor/gpu_process_transport_factory.h',
-    'browser/compositor/image_transport_factory.cc',
-    'browser/compositor/image_transport_factory.h',
-    'browser/compositor/no_transport_image_transport_factory.cc',
-    'browser/compositor/no_transport_image_transport_factory.h',
-    'browser/compositor/owned_mailbox.h',
-    'browser/compositor/owned_mailbox.cc',
-    'browser/compositor/reflector_impl.cc',
-    'browser/compositor/reflector_impl.h',
-    'browser/compositor/resize_lock.cc',
-    'browser/compositor/resize_lock.h',
-    'browser/compositor/gpu_browser_compositor_output_surface.cc',
-    'browser/compositor/gpu_browser_compositor_output_surface.h',
-    'browser/compositor/software_browser_compositor_output_surface.cc',
-    'browser/compositor/software_browser_compositor_output_surface.h',
-    'browser/compositor/software_output_device_ozone.cc',
-    'browser/compositor/software_output_device_ozone.h',
-    'browser/compositor/software_output_device_win.cc',
-    'browser/compositor/software_output_device_win.h',
-    'browser/compositor/software_output_device_x11.cc',
-    'browser/compositor/software_output_device_x11.h',
     'browser/cross_site_request_manager.cc',
     'browser/cross_site_request_manager.h',
     'browser/devtools/devtools_agent_host_impl.cc',
@@ -819,8 +821,6 @@
     'browser/renderer_host/compositing_iosurface_transformer_mac.h',
     'browser/renderer_host/compositor_impl_android.cc',
     'browser/renderer_host/compositor_impl_android.h',
-    'browser/renderer_host/compositor_resize_lock_aura.cc',
-    'browser/renderer_host/compositor_resize_lock_aura.h',
     'browser/renderer_host/database_message_filter.cc',
     'browser/renderer_host/database_message_filter.h',
     'browser/renderer_host/delegated_frame_evictor.cc',
@@ -1561,6 +1561,7 @@
       'dependencies': [
         '../ui/aura/aura.gyp:aura',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/compositor/compositor.gyp:compositor',
       ],
       'sources/': [
         ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
@@ -1570,6 +1571,7 @@
       ],
     }, {
       'sources/': [
+        ['exclude', '^browser/aura/'],
         ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc'],
         ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'],
         ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'],
@@ -1579,15 +1581,6 @@
         ['exclude', '^browser/renderer_host/ui_events_helper.h'],
       ],
     }],
-    ['use_aura==1 or OS=="mac"', {
-      'dependencies': [
-        '../ui/compositor/compositor.gyp:compositor',
-      ],
-    }, {
-      'sources/': [
-        ['exclude', '^browser/compositor/'],
-      ]
-    }],
     ['enable_plugins==1', {
       'dependencies': [
         '../ppapi/ppapi_internal.gyp:ppapi_ipc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 03bd3d4..cfb5681 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -277,12 +277,8 @@
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura_test_support',
-            '../ui/resources/ui_resources.gyp:ui_test_pak',
-          ],
-        }],
-        ['use_aura==1 or OS=="mac"', {
-          'dependencies': [
             '../ui/compositor/compositor.gyp:compositor',
+            '../ui/resources/ui_resources.gyp:ui_test_pak',
           ],
         }],
         ['OS=="win"', {
@@ -334,12 +330,12 @@
         'browser/accessibility/browser_accessibility_manager_unittest.cc',
         'browser/accessibility/browser_accessibility_win_unittest.cc',
         'browser/appcache/chrome_appcache_service_unittest.cc',
+        'browser/aura/software_browser_compositor_output_surface_unittest.cc',
+        'browser/aura/software_output_device_ozone_unittest.cc',
         'browser/browser_thread_unittest.cc',
         'browser/browser_url_handler_impl_unittest.cc',
         'browser/byte_stream_unittest.cc',
         'browser/child_process_security_policy_unittest.cc',
-        'browser/compositor/software_browser_compositor_output_surface_unittest.cc',
-        'browser/compositor/software_output_device_ozone_unittest.cc',
         'browser/device_orientation/data_fetcher_impl_android_unittest.cc',
         'browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc',
         'browser/devtools/devtools_http_handler_unittest.cc',
@@ -788,11 +784,6 @@
             '../ui/events/events.gyp:events_test_support',
           ],
         }],
-        ['use_aura!=1 and OS!="mac"', {
-          'sources/': [
-            ['exclude', '^browser/compositor/'],
-          ],
-        }],
         ['OS == "android"', {
           'sources': [
             'browser/renderer_host/java/jni_helper_unittest.cc',
@@ -948,7 +939,7 @@
             'browser/accessibility/accessibility_win_browsertest.cc',
             'browser/accessibility/cross_platform_accessibility_browsertest.cc',
             'browser/accessibility/dump_accessibility_tree_browsertest.cc',
-            'browser/compositor/image_transport_factory_browsertest.cc',
+            'browser/aura/image_transport_factory_browsertest.cc',
             'browser/bookmarklet_browsertest.cc',
             'browser/browser_plugin/browser_plugin_host_browsertest.cc',
             'browser/browser_plugin/test_browser_plugin_embedder.cc',
@@ -1105,6 +1096,10 @@
               'sources!': [
                 'browser/accessibility/accessibility_win_browsertest.cc',
               ],
+            }, {
+              'sources/': [
+                ['exclude', '^browser/aura/'],
+              ],
             }],
             ['use_aura==1 and OS!="win"', {
               'sources!': [
@@ -1116,11 +1111,6 @@
                 '../ui/events/events.gyp:events_test_support',
               ],
             }],
-            ['use_aura!=1 and OS!="mac"', {
-              'sources/': [
-                ['exclude', '^browser/compositor/'],
-              ],
-            }],
             ['OS!="android" and OS!="ios"', {
               # npapi test plugin doesn't build on android or ios
               'dependencies': [
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index 164f39e..a8733e4 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -37,7 +37,7 @@
 #endif
 
 #if defined(USE_AURA)
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "ui/compositor/test/test_context_factory.h"
 #endif