Move some non-unittest files to compositor_test_support

ui/compositor/test/test_compositor_host_mac.mm

 // 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 "ui/compositor/test/test_compositor_host.h"
 
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSOpenGL.h>
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>
@@ skipping 60 matching lines @@
     [NSApplication sharedApplication];
   }
   virtual ~AppKitHost() {
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(AppKitHost);
 };
 
 // TestCompositorHostMac provides a window surface and a coordinated compositor
 // for use in the compositor unit tests.
-class TestCompositorHostMac : public TestCompositorHost
+class TestCompositorHostMac : public TestCompositorHost,
                               public AppKitHost {
  public:
   TestCompositorHostMac(const gfx::Rect& bounds);
   virtual ~TestCompositorHostMac();
 
  private:
   // TestCompositorHost:
   virtual void Show() OVERRIDE;
   virtual ui::Compositor* GetCompositor() OVERRIDE;
 
@@ skipping 25 matching lines @@
   window_ = [[NSWindow alloc]
                 initWithContentRect:NSMakeRect(bounds_.x(),
                                                bounds_.y(),
                                                bounds_.width(),
                                                bounds_.height())
                           styleMask:NSBorderlessWindowMask
                             backing:NSBackingStoreBuffered
                               defer:NO];
   base::scoped_nsobject<AcceleratedTestView> view(
       [[AcceleratedTestView alloc] init]);
-  compositor_.reset(new ui::Compositor(view, bounds_.size()));
+  compositor_.reset(new ui::Compositor(view));
+  compositor_->SetScaleAndSize(1.0f, bounds_.size());
   [view setCompositor:compositor_.get()];
   [window_ setContentView:view];
   [window_ orderFront:nil];
 }
 
 ui::Compositor* TestCompositorHostMac::GetCompositor() {
   return compositor_.get();
 }
 
 // static
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostMac(bounds);
 }
 
 }  // namespace ui