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

ash/display/mirror_window_controller.cc

Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 8d48cfd917421cc73d8bc7bb29b245a80bf65bd6..6841986a85d6b7884e82bfdc6f2c88cfce9d2d90 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -227,9 +227,11 @@ void MirrorWindowController::UpdateWindow(
         reflector_->AddMirroringLayer(mirror_window->layer());
       } else {
         reflector_ =
-            aura::Env::GetInstance()->context_factory()->CreateReflector(
-                Shell::GetPrimaryRootWindow()->GetHost()->compositor(),
-                mirror_window->layer());
+            aura::Env::GetInstance()
+                ->context_factory_private()
+                ->CreateReflector(
+                    Shell::GetPrimaryRootWindow()->GetHost()->compositor(),
+                    mirror_window->layer());
       }
     } else {
       AshWindowTreeHost* ash_host =
@@ -283,7 +285,7 @@ void MirrorWindowController::Close(bool delay_host_deletion) {
 
   mirroring_host_info_map_.clear();
   if (reflector_) {
-    aura::Env::GetInstance()->context_factory()->RemoveReflector(
+    aura::Env::GetInstance()->context_factory_private()->RemoveReflector(
         reflector_.get());
     reflector_.reset();
   }