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

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 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.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 150 matching lines @@
     } else {
       LOG(ERROR) << "Could not open test data directory.";
     }
     gfx::FontList::SetDefaultFontDescription("Arial, Times New Roman, 15px");
   }
   ~LayerWithRealCompositorTest() override {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     bool enable_pixel_output = true;
-    ui::ContextFactory* context_factory =
-        InitializeContextFactoryForTests(enable_pixel_output);
+    ui::ContextFactory* context_factory = nullptr;
+    ui::ContextFactoryPrivate* context_factory_private = nullptr;
+    InitializeContextFactoryForTests(enable_pixel_output, &context_factory,
+                                     &context_factory_private);
 
     const gfx::Rect host_bounds(10, 10, 500, 500);
-    compositor_host_.reset(
-        TestCompositorHost::Create(host_bounds, context_factory));
+    compositor_host_.reset(TestCompositorHost::Create(
+        host_bounds, context_factory, context_factory_private));
     compositor_host_->Show();
   }
 
   void TearDown() override {
     ResetCompositor();
     TerminateContextFactoryForTests();
   }
 
   Compositor* GetCompositor() { return compositor_host_->GetCompositor(); }
 
@@ skipping 308 matching lines @@
 }
 
 class LayerWithDelegateTest : public testing::Test {
  public:
   LayerWithDelegateTest() {}
   ~LayerWithDelegateTest() override {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     bool enable_pixel_output = false;
-    ui::ContextFactory* context_factory =
-        InitializeContextFactoryForTests(enable_pixel_output);
+    ui::ContextFactory* context_factory = nullptr;
+    ui::ContextFactoryPrivate* context_factory_private = nullptr;
+
+    InitializeContextFactoryForTests(enable_pixel_output, &context_factory,
+                                     &context_factory_private);
 
     const gfx::Rect host_bounds(1000, 1000);
-    compositor_host_.reset(TestCompositorHost::Create(host_bounds,
-                                                      context_factory));
+    compositor_host_.reset(TestCompositorHost::Create(
+        host_bounds, context_factory, context_factory_private));
     compositor_host_->Show();
   }
 
   void TearDown() override {
     compositor_host_.reset();
     TerminateContextFactoryForTests();
   }
 
   Compositor* compositor() { return compositor_host_->GetCompositor(); }
 
@@ skipping 1733 matching lines @@
   layer.set_name("foo");
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat> debug_info =
       layer.TakeDebugInfo(nullptr);
   std::string trace_format("bar,");
   debug_info->AppendAsTraceFormat(&trace_format);
   std::string expected("bar,{\"layer_name\":\"foo\"}");
   EXPECT_EQ(expected, trace_format);
 }
 
 }  // namespace ui