Bug 868778 - Part a: Move nsDOMDataChannel.h to nsDOMDataChannelDeclarations.h; r=jesup

--HG--
rename : content/base/src/nsDOMDataChannel.h => content/base/src/nsDOMDataChannelDeclarations.h

content/base/src/moz.build

@@ -35,7 +35,9 @@ EXPORTS += [
 ]
 
 if CONFIG['MOZ_WEBRTC']:
-    EXPORTS += ['nsDOMDataChannel.h']
+    EXPORTS += [
+        'nsDOMDataChannelDeclarations.h',
+    ]
 
 EXPORTS.mozilla.dom += [
     'Attr.h',

content/base/src/nsDOMDataChannel.cpp

@@ -18,7 +18,7 @@ extern PRLogModuleInfo* GetDataChannelLog();
 #define LOG(args) PR_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)
 
 
-#include "nsDOMDataChannel.h"
+#include "nsDOMDataChannelDeclarations.h"
 #include "nsIDOMFile.h"
 #include "nsIJSNativeInitializer.h"
 #include "nsIDOMDataChannel.h"

content/base/src/nsDOMDataChannelDeclarations.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef nsDOMDataChannel_h__
+#ifndef nsDOMDataChannelDeclarations_h
-#define nsDOMDataChannel_h__
+#define nsDOMDataChannelDeclarations_h
 
 // This defines only what's necessary to create nsDOMDataChannels, since this
 // gets used with MOZ_INTERNAL_API not set for media/webrtc/signaling/testing
@@ -27,4 +27,4 @@ NS_NewDOMDataChannel(already_AddRefed<mozilla::DataChannel> dataChannel,
 // Tell DataChannel it's ok to deliver open and message events
 void NS_DataChannelAppReady(nsIDOMDataChannel* domDataChannel);
 
-#endif
+#endif // nsDOMDataChannelDeclarations_h

media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp

@@ -33,7 +33,7 @@
 #include "PeerConnectionCtx.h"
 #include "PeerConnectionImpl.h"
 #include "nsPIDOMWindow.h"
-#include "nsDOMDataChannel.h"
+#include "nsDOMDataChannelDeclarations.h"
 
 #ifdef MOZILLA_INTERNAL_API
 #include "nsContentUtils.h"