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

content/public/browser/context_factory.h

Index: content/public/browser/context_factory.h
diff --git a/content/public/browser/context_factory.h b/content/public/browser/context_factory.h
index 07f2462279b0499b34ed62b09cce72c9c77e8a22..adcd8a5b989792906a3c4f7105b646636756a886 100644
--- a/content/public/browser/context_factory.h
+++ b/content/public/browser/context_factory.h
@@ -9,6 +9,7 @@
 
 namespace ui {
 class ContextFactory;
+class ContextFactoryPrivate;
 }
 
 namespace content {
@@ -17,6 +18,12 @@ namespace content {
 // owned by content.
 CONTENT_EXPORT ui::ContextFactory* GetContextFactory();
 
+// Returns the singleton ContextFactoryPrivate used by content. The return value
+// is owned by content.
+// TODO(fsamuel): Once Mus is used on all platforms, this private interface
+// should not be necessary.
+CONTENT_EXPORT ui::ContextFactoryPrivate* GetContextFactoryPrivate();

[rjkroege, 2016/12/08 23:42:59]

so in a mus context, there should be no calls to this code from within Chrome
browser process?

[Fady Samuel, 2016/12/13 19:13:59]

There will be for now. Apps that use the Mus client lib directly, and use the
unified display compositor will not need this. Currently Chrome DOES need this
but this will change once I split out GpuProcessTransportFactory in a subsequent
CL.

+
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTEXT_FACTORY_H_