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

ash/display/mirror_window_controller.cc

 // Copyright (c) 2013 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 "ash/display/mirror_window_controller.h"
 
 #include <utility>
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
@@ skipping 209 matching lines @@
           new aura::Window(nullptr);
       mirror_window->Init(ui::LAYER_SOLID_COLOR);
       host->window()->AddChild(mirror_window);
       host_info->ash_host->SetRootWindowTransformer(std::move(transformer));
       mirror_window->SetBounds(host->window()->bounds());
       mirror_window->Show();
       if (reflector_) {
         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 =
           mirroring_host_info_map_[display_info.id()]->ash_host.get();
       aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
       GetRootWindowSettings(host->window())->display_id = display_info.id();
       ash_host->SetRootWindowTransformer(std::move(transformer));
       host->SetBoundsInPixels(display_info.bounds_in_native());
     }
   }
@@ skipping 33 matching lines @@
     Close(true);
   multi_display_mode_ = new_mode;
 }
 
 void MirrorWindowController::Close(bool delay_host_deletion) {
   for (auto& info : mirroring_host_info_map_)
     CloseAndDeleteHost(info.second, 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();
   }
 }
 
 void MirrorWindowController::OnHostResized(const aura::WindowTreeHost* host) {
   for (auto& pair : mirroring_host_info_map_) {
     MirroringHostInfo* info = pair.second;
     if (info->ash_host->AsWindowTreeHost() == host) {
       if (info->mirror_window_host_size == host->GetBoundsInPixels().size())
@@ skipping 74 matching lines @@
   // EventProcessor may be accessed after this call if the mirroring window
   // was deleted as a result of input event (e.g. shortcut), so don't delete
   // now.
   if (delay_host_deletion)
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info);
   else
     delete host_info;
 }
 
 }  // namespace ash