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

ui/views/test/test_views_delegate_aura.cc

Index: ui/views/test/test_views_delegate_aura.cc
diff --git a/ui/views/test/test_views_delegate_aura.cc b/ui/views/test/test_views_delegate_aura.cc
index 9cb171383ad807bad9a3fa9863e6ff95f9908dd9..cf4588af37e4d983d26aa35012078a03b27f49df 100644
--- a/ui/views/test/test_views_delegate_aura.cc
+++ b/ui/views/test/test_views_delegate_aura.cc
@@ -16,9 +16,9 @@ namespace views {
 
 TestViewsDelegate::TestViewsDelegate()
     : context_factory_(nullptr),
+      context_factory_private_(nullptr),
       use_desktop_native_widgets_(false),
-      use_transparent_windows_(false) {
-}
+      use_transparent_windows_(false) {}
 
 TestViewsDelegate::~TestViewsDelegate() {
 }
@@ -51,4 +51,12 @@ ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
   return nullptr;
 }
 
+ui::ContextFactoryPrivate* TestViewsDelegate::GetContextFactoryPrivate() {
+  if (context_factory_private_)
+    return context_factory_private_;
+  if (aura::Env::GetInstance())
+    return aura::Env::GetInstance()->context_factory_private();
+  return nullptr;
+}
+
 }  // namespace views