Backed out changeset 301e80f20046 (bug 1372405) for bustage

--HG--
extra : rebase_source : e878e085dc4f872e3af0d9f98337ac6d2e86f37a

xpcom/threads/SchedulerGroup.cpp

@@ -339,15 +339,17 @@ SchedulerGroup::Runnable::Runnable(already_AddRefed<nsIRunnable>&& aRunnable,
 NS_IMETHODIMP
 SchedulerGroup::Runnable::GetName(nsACString& aName)
 {
-  // Try to get a name from the underlying runnable.
-  nsCOMPtr<nsINamed> named = do_QueryInterface(mRunnable);
-  if (named) {
-    named->GetName(aName);
-  }
+  mozilla::Runnable::GetName(aName);
   if (aName.IsEmpty()) {
-    aName.AssignLiteral("anonymous");
+    // Try to get a name from the underlying runnable.
+    nsCOMPtr<nsINamed> named = do_QueryInterface(mRunnable);
+    if (named) {
+      named->GetName(aName);
+    }
+    if (aName.IsEmpty()) {
+      aName.AssignLiteral("anonymous");
+    }
   }
-
   aName.AppendASCII("(labeled)");
   return NS_OK;
 }