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

content/browser/compositor/image_transport_factory.h

Index: content/browser/compositor/image_transport_factory.h
diff --git a/content/browser/compositor/image_transport_factory.h b/content/browser/compositor/image_transport_factory.h
index ffd336a6eef22ee89ea85c6de3da22b0d15c0fbf..e10d8ab2cdf2bacd02bbec0da292c01e558753c6 100644
--- a/content/browser/compositor/image_transport_factory.h
+++ b/content/browser/compositor/image_transport_factory.h
@@ -23,6 +23,7 @@ enum class SwapResult;
 namespace ui {
 class Compositor;
 class ContextFactory;
+class ContextFactoryPrivate;
 }
 
 namespace display_compositor {
@@ -60,6 +61,11 @@ class CONTENT_EXPORT ImageTransportFactory {
   // Gets the image transport factory as a context factory for the compositor.
   virtual ui::ContextFactory* GetContextFactory() = 0;
 
+  // Gets the image transport factory as the privileged context factory for the
+  // compositor. TODO(fsamuel): This interface should eventually go away once
+  // Mus subsumes this functionality.
+  virtual ui::ContextFactoryPrivate* GetContextFactoryPrivate() = 0;
+
   // Gets a GLHelper instance, associated with the shared context. This
   // GLHelper will get destroyed whenever the shared context is lost
   // (ImageTransportFactoryObserver::OnLostResources is called).