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

content/browser/context_factory.cc

Index: content/browser/context_factory.cc
diff --git a/content/browser/context_factory.cc b/content/browser/context_factory.cc
index b9dfacc0dec0e12bbe11b7cd1239d629578499fb..aacdf25fc281e85a6dc7b6d347e209c9432e8605 100644
--- a/content/browser/context_factory.cc
+++ b/content/browser/context_factory.cc
@@ -13,4 +13,9 @@ ui::ContextFactory* GetContextFactory() {
   return ImageTransportFactory::GetInstance()->GetContextFactory();
 }
 
+ui::ContextFactoryPrivate* GetContextFactoryPrivate() {

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

presuming that I am correct in my understanding that this should never be
invoked from a mus client, could it have a DCHECK enforcing this -- i.e. test if
we're running in --mash mode and check?

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

That is correct but unfortunately, Chrome has its own ContextFactoryPrivate for
now: GpuProcessTransportFactory. I intend to fix this in a subsequent CL.

+  DCHECK(ImageTransportFactory::GetInstance());
+  return ImageTransportFactory::GetInstance()->GetContextFactoryPrivate();
+}
+
 }  // namespace content