Bug 995730 - Fix style violations in xpcom/base/. r=froydnj,continuation