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

ui/aura/env.h

Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 19678abee67a4ff356f5fef7b33ae0ade59b7ecc..3d2bccc124dbac27933370cd125314fdb3162c43 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -17,6 +17,7 @@
 
 namespace ui {
 class ContextFactory;
+class ContextFactoryPrivate;
 class PlatformEventSource;
 }
 namespace aura {
@@ -87,6 +88,14 @@ class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
   }
   ui::ContextFactory* context_factory() { return context_factory_; }
 
+  void set_context_factory_private(

[sky, 2016/12/13 21:29:54]

Are these temporary? I wouldn't expect a class with the name Private to be
publically exposed. But I'm not familiar with the class, if you say it makes
sense I'm fine.

Also, is there a case where you would set one but not the other? Should the
setter take and set both at the same time, e.g.
SetContentFactories(ui::ContextFactory* context_factory,
ui::ContextFactoryPrivate* context_factory_private);

[Fady Samuel, 2016/12/13 21:55:58]

Yes, Mus clients other than Chrome should not have a ContextFactoryPrivate.

ContextFactoryPrivate is a temporary concept until we pull out the code into the
display compositor API.

+      ui::ContextFactoryPrivate* context_factory_private) {
+    context_factory_private_ = context_factory_private;
+  }
+  ui::ContextFactoryPrivate* context_factory_private() {
+    return context_factory_private_;
+  }
+
   // See CreateInstance() for description.
   void SetWindowTreeClient(WindowTreeClient* window_tree_client);
   bool HasWindowTreeClient() const { return window_tree_client_ != nullptr; }
@@ -143,6 +152,7 @@ class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
   std::unique_ptr<ui::PlatformEventSource> event_source_;
 
   ui::ContextFactory* context_factory_;
+  ui::ContextFactoryPrivate* context_factory_private_;
 
   Window* active_focus_client_root_ = nullptr;
   client::FocusClient* active_focus_client_ = nullptr;