Cleanup some code

Author: shana

src/GitHub.Exports/Services/UsageTracker.cs

@@ -10,6 +10,7 @@
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
+using GitHub.Extensions;
 
 namespace GitHub.Services
 {
@@ -21,7 +22,7 @@ public class UsageTracker : IUsageTracker
         static readonly Calendar cal = CultureInfo.InvariantCulture.Calendar;
 
         readonly IMetricsService client;
-        readonly Lazy<IConnectionManager> connectionManager;
+        readonly IConnectionManager connectionManager;
         readonly IPackageSettings userSettings;
         readonly DispatcherTimer timer;
         readonly string storePath;
@@ -34,20 +35,18 @@ public class UsageTracker : IUsageTracker
         [ImportingConstructor]
         public UsageTracker(
             IProgram program,
-            Lazy<IConnectionManager> connectionManager,
+            IConnectionManager connectionManager,
             IPackageSettings userSettings,
             [Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
         {
-            var componentModel = serviceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
-
             fileExists = (path) => System.IO.File.Exists(path);
             readAllText = (path, encoding) => System.IO.File.ReadAllText(path, encoding);
             writeAllText = (path, content, encoding) => System.IO.File.WriteAllText(path, content, encoding);
             dirCreate = (path) => System.IO.Directory.CreateDirectory(path);
 
             this.connectionManager = connectionManager;
             this.userSettings = userSettings;
-            this.client = componentModel?.DefaultExportProvider.GetExportedValue<IMetricsService>();
+            this.client = serviceProvider.GetExportedValue<IMetricsService>();
             this.timer = new DispatcherTimer(
                 TimeSpan.FromMinutes(1),
                 DispatcherPriority.Background,
@@ -206,8 +205,6 @@ async Task SendUsage(UsageModel usage, bool weekly, bool monthly)
         {
             Debug.Assert(client != null, "SendUsage should not be called when there is no IMetricsService");
 
-            var connectionManager = this.connectionManager.Value;
-
             if (connectionManager.Connections.Any(x => x.HostAddress.IsGitHubDotCom()))
             {
                 usage.IsGitHubUser = true;