Bug 1307216 - Remove warning about non-existent plug-in registry key. r?bsmedberg draft
authorEric Rahm <erahm@mozilla.com>
Tue, 04 Oct 2016 10:18:17 -0700
changeset 420787 826ee0358c03bb512a3b89c7dbd961289b45fb2f
parent 420017 955840bfd3c20eb24dd5a01be27bdc55c489a285
child 532892 528a07839b8facb4ee921048d8942a4c3ecfdf4f
push id31292
push usererahm@mozilla.com
push dateTue, 04 Oct 2016 17:18:38 +0000
reviewersbsmedberg
bugs1307216
milestone52.0a1
Bug 1307216 - Remove warning about non-existent plug-in registry key. r?bsmedberg It's possible the plugin key doesn't exist, there's no need to warn about that. MozReview-Commit-ID: Law8J9zUHCt
dom/plugins/base/nsPluginHost.cpp
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -2356,17 +2356,17 @@ WatchRegKey(uint32_t aRoot, nsCOMPtr<nsI
 
   aKey = do_CreateInstance("@mozilla.org/windows-registry-key;1");
   if (!aKey) {
     return;
   }
   nsresult rv = aKey->Open(aRoot,
                            NS_LITERAL_STRING("Software\\MozillaPlugins"),
                            nsIWindowsRegKey::ACCESS_READ | nsIWindowsRegKey::ACCESS_NOTIFY);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
+  if (NS_FAILED(rv)) {
     aKey = nullptr;
     return;
   }
   aKey->StartWatching(true);
 }
 #endif
 
 nsresult nsPluginHost::LoadPlugins()