--- a/dom/system/windows/WindowsLocationProvider.cpp
+++ b/dom/system/windows/WindowsLocationProvider.cpp
@@ -5,22 +5,27 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WindowsLocationProvider.h"
 #include "GeolocationPosition.h"
 #include "nsComponentManagerUtils.h"
 #include "prtime.h"
 #include "MLSFallback.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Logging.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/dom/GeolocationPositionErrorBinding.h"
 
 namespace mozilla::dom {
 
+LazyLogModule gWindowsLocationProviderLog("WindowsLocationProvider");
+#define LOG(...) \
+  MOZ_LOG(gWindowsLocationProviderLog, LogLevel::Debug, (__VA_ARGS__))
+
 NS_IMPL_ISUPPORTS(WindowsLocationProvider::MLSUpdate, nsIGeolocationUpdate);
 
 WindowsLocationProvider::MLSUpdate::MLSUpdate(nsIGeolocationUpdate* aCallback)
     : mCallback(aCallback) {}
 
 NS_IMETHODIMP
 WindowsLocationProvider::MLSUpdate::Update(nsIDOMGeoPosition* aPosition) {
   if (!mCallback) {
@@ -173,22 +178,32 @@ LocationEvent::OnLocationChanged(REFIID 
 
   Telemetry::Accumulate(Telemetry::GEOLOCATION_WIN8_SOURCE_IS_MLS, false);
 
   return S_OK;
 }
 
 NS_IMPL_ISUPPORTS(WindowsLocationProvider, nsIGeolocationProvider)
 
-WindowsLocationProvider::WindowsLocationProvider() {}
+WindowsLocationProvider::WindowsLocationProvider() {
+  LOG("WindowsLocationProvider::WindowsLocationProvider(%p)\n", this);
+}
 
-WindowsLocationProvider::~WindowsLocationProvider() {}
+WindowsLocationProvider::~WindowsLocationProvider() {
+  LOG("WindowsLocationProvider::~WindowsLocationProvider(%p, %p)\n", this,
+      mLocation.get());
+}
 
 NS_IMETHODIMP
 WindowsLocationProvider::Startup() {
+  LOG("WindowsLocationProvider::Startup(%p, %p)\n", this, mLocation.get());
+  if (mLocation) {
+    return NS_OK;
+  }
+
   RefPtr<ILocation> location;
   if (FAILED(::CoCreateInstance(CLSID_Location, nullptr, CLSCTX_INPROC_SERVER,
                                 IID_ILocation, getter_AddRefs(location)))) {
     // We will use MLS provider
     return NS_OK;
   }
 
   IID reportTypes[] = {IID_ILatLongReport};
@@ -198,31 +213,34 @@ WindowsLocationProvider::Startup() {
   }
 
   mLocation = location;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 WindowsLocationProvider::Watch(nsIGeolocationUpdate* aCallback) {
+  LOG("WindowsLocationProvider::Watch(%p, %p)\n", this, mLocation.get());
   if (mLocation) {
     RefPtr<LocationEvent> event = new LocationEvent(aCallback, this);
     if (SUCCEEDED(mLocation->RegisterForReport(event, IID_ILatLongReport, 0))) {
       return NS_OK;
     }
   }
 
   // Cannot use Location API.  We will use MLS instead.
+  LOG(" > MLS fallback\n");
   mLocation = nullptr;
 
   return CreateAndWatchMLSProvider(aCallback);
 }
 
 NS_IMETHODIMP
 WindowsLocationProvider::Shutdown() {
+  LOG("WindowsLocationProvider::Shutdown(%p, %p)\n", this, mLocation.get());
   if (mLocation) {
     mLocation->UnregisterForReport(IID_ILatLongReport);
     mLocation = nullptr;
   }
 
   CancelMLSProvider();
 
   return NS_OK;
@@ -262,9 +280,11 @@ void WindowsLocationProvider::CancelMLSP
   if (!mMLSProvider) {
     return;
   }
 
   mMLSProvider->Shutdown();
   mMLSProvider = nullptr;
 }
 
+#undef LOG
+
 }  // namespace mozilla::dom