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

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 373 matching lines @@
       device_scale_factor_(0.0f),
       last_active_widget_process_id_(ChildProcessHost::kInvalidUniqueID),
       last_active_widget_routing_id_(MSG_ROUTING_NONE),
       event_handler_(new RenderWidgetHostViewEventHandler(host_, this, this)),
       weak_ptr_factory_(this) {
   // GuestViews have two RenderWidgetHostViews and so we need to make sure
   // we don't have FrameSinkId collisions.
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   cc::FrameSinkId frame_sink_id =
       is_guest_view_hack_
-          ? factory->GetContextFactory()->AllocateFrameSinkId()
+          ? factory->GetContextFactoryPrivate()->AllocateFrameSinkId()
           : cc::FrameSinkId(
                 base::checked_cast<uint32_t>(host_->GetProcess()->GetID()),
                 base::checked_cast<uint32_t>(host_->GetRoutingID()));
   delegated_frame_host_ =
       base::MakeUnique<DelegatedFrameHost>(frame_sink_id, this);
 
   if (!is_guest_view_hack_)
     host_->SetView(this);
 
   // Let the page-level input event router know about our surface ID
@@ skipping 1989 matching lines @@
 
 void RenderWidgetHostViewAura::SetPopupChild(
     RenderWidgetHostViewAura* popup_child_host_view) {
   popup_child_host_view_ = popup_child_host_view;
   event_handler_->SetPopupChild(
       popup_child_host_view,
       popup_child_host_view ? popup_child_host_view->event_handler() : nullptr);
 }
 
 }  // namespace content