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

ui/views/test/test_views_delegate.h

Index: ui/views/test/test_views_delegate.h
diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h
index e1986ab37bf39b21505bacf3a401f84bab6148cb..588b0d37d4c804cf63312ec66758d3a1bb4bfea8 100644
--- a/ui/views/test/test_views_delegate.h
+++ b/ui/views/test/test_views_delegate.h
@@ -34,6 +34,11 @@ class TestViewsDelegate : public ViewsDelegate {
     context_factory_ = context_factory;
   }
 
+  void set_context_factory_private(
+      ui::ContextFactoryPrivate* context_factory_private) {
+    context_factory_private_ = context_factory_private;
+  }
+
   // ViewsDelegate:
 #if defined(OS_WIN)
   HICON GetSmallWindowIcon() const override;
@@ -41,9 +46,11 @@ class TestViewsDelegate : public ViewsDelegate {
   void OnBeforeWidgetInit(Widget::InitParams* params,
                           internal::NativeWidgetDelegate* delegate) override;
   ui::ContextFactory* GetContextFactory() override;
+  ui::ContextFactoryPrivate* GetContextFactoryPrivate() override;
 
  private:
   ui::ContextFactory* context_factory_;
+  ui::ContextFactoryPrivate* context_factory_private_;
   bool use_desktop_native_widgets_;
   bool use_transparent_windows_;