--- a/dom/media/MediaSegment.h
+++ b/dom/media/MediaSegment.h
@@ -66,17 +66,17 @@ typedef nsMainThreadPtrHandle<nsIPrincip
 
 inline PrincipalHandle MakePrincipalHandle(nsIPrincipal* aPrincipal)
 {
   RefPtr<nsMainThreadPtrHolder<nsIPrincipal>> holder =
     new nsMainThreadPtrHolder<nsIPrincipal>(aPrincipal);
   return PrincipalHandle(holder);
 }
 
-const PrincipalHandle PRINCIPAL_HANDLE_NONE(nullptr);
+#define PRINCIPAL_HANDLE_NONE nullptr
 
 inline nsIPrincipal* GetPrincipalFromHandle(PrincipalHandle& aPrincipalHandle)
 {
   MOZ_ASSERT(NS_IsMainThread());
   return aPrincipalHandle.get();
 }
 
 inline bool PrincipalHandleMatches(PrincipalHandle& aPrincipalHandle,

--- a/media/webrtc/signaling/test/FakeMediaStreamsImpl.h
+++ b/media/webrtc/signaling/test/FakeMediaStreamsImpl.h
@@ -116,17 +116,17 @@ void Fake_AudioStreamSource::Periodic() 
   }
 
   mozilla::AudioSegment segment;
   AutoTArray<const int16_t *,1> channels;
   channels.AppendElement(data);
   segment.AppendFrames(samples.forget(),
                        channels,
                        AUDIO_BUFFER_SIZE,
-                       mozilla::PRINCIPAL_HANDLE_NONE);
+                       PRINCIPAL_HANDLE_NONE);
 
   for(std::set<RefPtr<Fake_MediaStreamListener>>::iterator it = mListeners.begin();
        it != mListeners.end(); ++it) {
     (*it)->NotifyQueuedTrackChanges(nullptr, // Graph
                                     0, // TrackID
                                     0, // Offset TODO(ekr@rtfm.com) fix
                                     0, // ???
                                     segment,