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

ui/views/test/test_views_delegate_aura.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/test/test_views_delegate.h"
 
 #include "build/build_config.h"
 #include "ui/aura/env.h"
 
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif  // !defined(OS_CHROMEOS)
 
 
 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() {
 }
 
 #if defined(OS_WIN)
 HICON TestViewsDelegate::GetSmallWindowIcon() const {
   return nullptr;
 }
 #endif
 
@@ skipping 12 matching lines @@
 }
 
 ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
   if (context_factory_)
     return context_factory_;
   if (aura::Env::GetInstance())
     return aura::Env::GetInstance()->context_factory();
   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