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 f295aaa46096e5edef0e3a5c9121a23820f4fdb3..86cf88f9b621ea4b630fe44720faac0d701371ea 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -146,14 +146,15 @@ class CustomWindowTargeter : public aura::WindowTargeter {
 
 Surface::Surface()
     : window_(new aura::Window(new CustomWindowDelegate(this))),
-      frame_sink_id_(
-          aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId()) {
+      frame_sink_id_(aura::Env::GetInstance()
+                         ->context_factory_private()

[rjkroege, 2016/12/14 00:15:31]

exo should not require this. Is there a separate bug tracking the removal of
this dependency?

[Fady Samuel, 2016/12/14 01:27:12]

I added a TODO. https://bugs.chromium.org/p/chromium/issues/detail?id=672961
added info here on how to deal with this.

+                         ->AllocateFrameSinkId()) {
   cc::mojom::MojoCompositorFrameSinkClientPtr frame_sink_holder_ptr;
   cc::mojom::MojoCompositorFrameSinkClientRequest frame_sink_client_request =
       mojo::GetProxy(&frame_sink_holder_ptr);
   std::unique_ptr<CompositorFrameSink> frame_sink(new CompositorFrameSink(
       frame_sink_id_,
-      aura::Env::GetInstance()->context_factory()->GetSurfaceManager(),
+      aura::Env::GetInstance()->context_factory_private()->GetSurfaceManager(),
       std::move(frame_sink_holder_ptr)));
   compositor_frame_sink_holder_ = new CompositorFrameSinkHolder(
       this, std::move(frame_sink), std::move(frame_sink_client_request));