From 3eaa9d0b6d04c45274239529df863d009fabedf7 Mon Sep 17 00:00:00 2001
From: Harsh Gupta <harshg@microsoft.com>
Date: Thu, 16 Oct 2014 12:04:22 -0700
Subject: [PATCH] Fixing a typo in the MarkerAwareValueProvider name. Also
 removing additional registration of IValueProviderFactoryProvider from
 services.

---
 .../ValueProviders/DictionaryBasedValueProvider.cs             | 2 +-
 .../ValueProviders/MarkerAwareValueProvider.cs                 | 2 +-
 .../ValueProviders/ReadableStringCollectionValueProvider.cs    | 3 ++-
 src/Microsoft.AspNet.Mvc/MvcServices.cs                        | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs
index 361d5ff64d..33679edf5b 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/DictionaryBasedValueProvider.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
 {
-    public class DictionaryBasedValueProvider<TBinderMarker> : MakerAwareValueProvider<TBinderMarker>
+    public class DictionaryBasedValueProvider<TBinderMarker> : MarkerAwareValueProvider<TBinderMarker>
         where TBinderMarker : IValueBinderMarker
     {
         private readonly IDictionary<string, object> _values;
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs
index 47b37f50a5..043608ab86 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/MarkerAwareValueProvider.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
     /// based on <see cref="IValueBinderMarker"/>.
     /// </summary>
     /// <typeparam name="TBinderMarker">Represents a type implementing <see cref="IValueBinderMarker"/></typeparam>
-    public abstract class MakerAwareValueProvider<TBinderMarker> : IMarkerAwareValueProvider
+    public abstract class MarkerAwareValueProvider<TBinderMarker> : IMarkerAwareValueProvider
         where TBinderMarker : IValueBinderMarker
     {
         public abstract Task<bool> ContainsPrefixAsync(string prefix);
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs
index 4e322574f7..7ca83309ca 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs
@@ -11,7 +11,8 @@ using Microsoft.AspNet.Mvc.ModelBinding.Internal;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
 {
-    public class ReadableStringCollectionValueProvider<TBinderMarker> : MakerAwareValueProvider<TBinderMarker>, IEnumerableValueProvider
+    public class ReadableStringCollectionValueProvider<TBinderMarker> : 
+        MarkerAwareValueProvider<TBinderMarker>, IEnumerableValueProvider
         where TBinderMarker : IValueBinderMarker
     {
         private readonly CultureInfo _culture;
diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs
index 58604d37aa..9c2cb6c596 100644
--- a/src/Microsoft.AspNet.Mvc/MvcServices.cs
+++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs
@@ -84,7 +84,6 @@ namespace Microsoft.AspNet.Mvc
             yield return describe.Scoped<ICompositeModelBinder, CompositeModelBinder>();
             yield return describe.Transient<IValueProviderFactoryProvider, DefaultValueProviderFactoryProvider>();
             yield return describe.Scoped<ICompositeValueProviderFactory, CompositeValueProviderFactory>();
-            yield return describe.Transient<IValueProviderFactoryProvider, DefaultValueProviderFactoryProvider>();
             yield return describe.Transient<IOutputFormattersProvider, DefaultOutputFormattersProvider>();
             yield return describe.Instance<JsonOutputFormatter>(new JsonOutputFormatter());