From 188a0ce442d7b8fb073ebfb9c1f07b50d561c3c7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 14 Jun 2017 01:45:49 +0200
Subject: [PATCH] Fix compile errors.

---
 tests/Avalonia.Benchmarks/Layout/Measure.cs        | 14 +++-----------
 .../LayoutManagerTests.cs                          |  2 --
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/tests/Avalonia.Benchmarks/Layout/Measure.cs b/tests/Avalonia.Benchmarks/Layout/Measure.cs
index d1fdae9971..b0490d8a0f 100644
--- a/tests/Avalonia.Benchmarks/Layout/Measure.cs
+++ b/tests/Avalonia.Benchmarks/Layout/Measure.cs
@@ -8,26 +8,18 @@ using BenchmarkDotNet.Attributes;
 namespace Avalonia.Benchmarks.Layout
 {
     [MemoryDiagnoser]
-    public class Measure : IDisposable
+    public class Measure
     {
-        private IDisposable _app;
         private TestRoot root;
         private List<Control> controls = new List<Control>();
 
         public Measure()
         {
-            _app = UnitTestApplication.Start(TestServices.RealLayoutManager);
-
             var panel = new StackPanel();
             root = new TestRoot { Child = panel };
             controls.Add(panel);
             CreateChildren(panel, 3, 5);
-            LayoutManager.Instance.ExecuteInitialLayoutPass(root);
-        }
-
-        public void Dispose()
-        {
-            _app.Dispose();
+            root.LayoutManager.ExecuteInitialLayoutPass(root);
         }
 
         [Benchmark]
@@ -43,7 +35,7 @@ namespace Avalonia.Benchmarks.Layout
                 }
             }
 
-            LayoutManager.Instance.ExecuteLayoutPass();
+            root.LayoutManager.ExecuteLayoutPass();
         }
 
         private void CreateChildren(IPanel parent, int childCount, int iterations)
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
index c4c0f9a441..5f43a8d00e 100644
--- a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
@@ -264,8 +264,6 @@ namespace Avalonia.Layout.UnitTests
         {
             using (AvaloniaLocator.EnterScope())
             {
-                AvaloniaLocator.CurrentMutable.Bind<ILayoutManager>().ToConstant(layoutManager);
-
                 Border border;
                 StackPanel panel;