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

content/browser/renderer_host/browser_compositor_view_mac.mm

 // Copyright 2014 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/browser_compositor_view_mac.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 81 matching lines @@
   std::unique_ptr<ui::AcceleratedWidgetMac> accelerated_widget_mac_;
   ui::Compositor compositor_;
   scoped_refptr<ui::CompositorLock> compositor_suspended_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(RecyclableCompositorMac);
 };
 
 RecyclableCompositorMac::RecyclableCompositorMac()
     : accelerated_widget_mac_(new ui::AcceleratedWidgetMac()),
       compositor_(content::GetContextFactory(),
+                  content::GetContextFactoryPrivate(),
                   ui::WindowResizeHelperMac::Get()->task_runner()) {
   compositor_.SetAcceleratedWidget(
       accelerated_widget_mac_->accelerated_widget());
   compositor_.SetLocksWillTimeOut(false);
   Suspend();
   compositor_.AddObserver(this);
 }
 
 RecyclableCompositorMac::~RecyclableCompositorMac() {
   compositor_.RemoveObserver(this);
@@ skipping 56 matching lines @@
     bool render_widget_host_is_hidden,
     bool ns_view_attached_to_window)
     : client_(client),
       accelerated_widget_mac_ns_view_(accelerated_widget_mac_ns_view),
       weak_factory_(this) {
   g_browser_compositor_count += 1;
 
   root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   delegated_frame_host_.reset(new DelegatedFrameHost(
-      factory->GetContextFactory()->AllocateFrameSinkId(), this));
+      factory->GetContextFactoryPrivate()->AllocateFrameSinkId(), this));
 
   SetRenderWidgetHostIsHidden(render_widget_host_is_hidden);
   SetNSViewAttachedToWindow(ns_view_attached_to_window);
 }
 
 BrowserCompositorMac::~BrowserCompositorMac() {
   // Ensure that copy callbacks completed or cancelled during further tear-down
   // do not call back into this.
   weak_factory_.InvalidateWeakPtrs();
 
@@ skipping 277 matching lines @@
 
 const cc::BeginFrameArgs& BrowserCompositorMac::LastUsedBeginFrameArgs() const {
   return last_begin_frame_args_;
 }
 
 void BrowserCompositorMac::OnBeginFrameSourcePausedChanged(bool paused) {
   // Only used on Android WebView.
 }
 
 }  // namespace content