[WIP] cc: Plumb SurfaceId from clients

cc/surfaces/surface_display_output_surface.h

 // Copyright 2014 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 CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 #define CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/output_surface.h"
@@ skipping 47 matching lines @@
 
  private:
   void SwapBuffersComplete(SurfaceDrawStatus drawn);
 
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;
 
   SurfaceManager* surface_manager_;
   SurfaceIdAllocator* surface_id_allocator_;
   Display* display_;
-  SurfaceFactory factory_;
+  std::unique_ptr<SurfaceFactory> factory_;
   SurfaceId delegated_surface_id_;
   gfx::Size last_swap_frame_size_;
   bool output_surface_lost_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_