ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

components/exo/surface.cc

Index: components/exo/surface.cc
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index 8c5ed61a34fbf8d36487c17dee035e2b90c4db1a..a46f2a69e782054f4b32796f8418878c8bcd280f 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -205,8 +205,9 @@ SurfaceFactoryOwner::~SurfaceFactoryOwner() {
 
 Surface::Surface()
     : window_(new aura::Window(new CustomWindowDelegate(this))),
-      surface_manager_(
-          aura::Env::GetInstance()->context_factory()->GetSurfaceManager()),
+      surface_manager_(aura::Env::GetInstance()
+                           ->context_factory_private()
+                           ->GetSurfaceManager()),
       factory_owner_(new SurfaceFactoryOwner) {
   window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   window_->SetName("ExoSurface");
@@ -216,8 +217,9 @@ Surface::Surface()
   window_->set_owned_by_parent(false);
   window_->AddObserver(this);
   factory_owner_->surface_ = this;
-  factory_owner_->frame_sink_id_ =
-      aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId();
+  factory_owner_->frame_sink_id_ = aura::Env::GetInstance()
+                                       ->context_factory_private()
+                                       ->AllocateFrameSinkId();
   factory_owner_->id_allocator_.reset(new cc::SurfaceIdAllocator());
   surface_manager_->RegisterFrameSinkId(factory_owner_->frame_sink_id_);
   surface_manager_->RegisterSurfaceFactoryClient(factory_owner_->frame_sink_id_,