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

ui/compositor/layer_owner_unittest.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/compositor/layer_owner.h"
 
 #include "base/macros.h"
 #include "base/test/null_task_runner.h"
 #include "cc/animation/animation_player.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 53 matching lines @@
 LayerOwnerTestWithCompositor::LayerOwnerTestWithCompositor() {
 }
 
 LayerOwnerTestWithCompositor::~LayerOwnerTestWithCompositor() {
 }
 
 void LayerOwnerTestWithCompositor::SetUp() {
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       new base::NullTaskRunner();
 
-  ui::ContextFactory* context_factory =
-      ui::InitializeContextFactoryForTests(false);
+  ui::ContextFactory* context_factory = nullptr;
+  ui::ContextFactoryPrivate* context_factory_private = nullptr;
 
-  compositor_.reset(new ui::Compositor(context_factory, task_runner));
+  ui::InitializeContextFactoryForTests(false, &context_factory,
+                                       &context_factory_private);
+
+  compositor_.reset(new ui::Compositor(context_factory, context_factory_private,
+                                       task_runner));
   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
 }
 
 void LayerOwnerTestWithCompositor::TearDown() {
   compositor_.reset();
   ui::TerminateContextFactoryForTests();
 }
 
 }  // namespace
 
@@ skipping 113 matching lines @@
 
   layer->SetOpacity(0.5f);
 
   scoped_refptr<cc::AnimationPlayer> player =
       layer->GetAnimator()->GetAnimationPlayerForTesting();
   EXPECT_TRUE(player);
   EXPECT_TRUE(player->animation_timeline());
 }
 
 }  // namespace ui