Rename constants files in webrtc/{media,p2p}

Multiple sources with the same names forces ugly GYP hacks in
Chromium's libjingle.gyp. Rename the sources in WebRTC to
enable cleaning this up in Chromium.

To summarize:
webrtc/media/base/constants.{cc,h} -> mediaconstants.{cc,h}
webrtc/p2p/base/constants.{cc,h} -> p2pconstants.{cc,h}

This CL will require coordinating landing a roll in Chromium.

BUG=webrtc:4256
NOTRY=True

Review URL: https://codereview.webrtc.org/1750593002

Cr-Commit-Position: refs/heads/master@{#11842}

webrtc/api/jsepsessiondescription_unittest.cc

@@ -18,7 +18,7 @@
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/pc/mediasession.h"
 

webrtc/api/peerconnection_unittest.cc

@@ -38,7 +38,7 @@
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/media/engine/fakewebrtcvideoengine.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/client/fakeportallocator.h"
 #include "webrtc/pc/mediasession.h"

webrtc/api/webrtcsdp.cc

@@ -25,12 +25,12 @@
 #include "webrtc/base/messagedigest.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/cryptoparams.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/media/sctp/sctpdataengine.h"
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/pc/mediasession.h"
 

webrtc/api/webrtcsdp_unittest.cc

@@ -24,8 +24,8 @@
 #include "webrtc/base/sslfingerprint.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/media/base/constants.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/pc/mediasession.h"
 
 using cricket::AudioCodec;

webrtc/api/webrtcsession.cc

@@ -31,7 +31,7 @@
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/call.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/transportchannel.h"

webrtc/media/base/codec.h

@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 
 namespace cricket {
 

webrtc/media/base/mediachannel.h

@@ -24,7 +24,7 @@
 #include "webrtc/base/socket.h"
 #include "webrtc/base/window.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/base/videosinkinterface.h"
 // TODO(juberti): re-evaluate this include

webrtc/media/base/mediaconstants.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 
 #include <string>
 

webrtc/media/base/mediaconstants.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_BASE_CONSTANTS_H_
-#define WEBRTC_MEDIA_BASE_CONSTANTS_H_
+#ifndef WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_
+#define WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_
 
 #include <string>
 
@@ -164,4 +164,4 @@ extern const int kDefaultVideoMaxHeight;
 extern const int kDefaultVideoMaxFramerate;
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_BASE_CONSTANTS_H_
+#endif  // WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_

webrtc/media/base/rtpdataengine.cc

@@ -16,7 +16,7 @@
 #include "webrtc/base/ratelimiter.h"
 #include "webrtc/base/timing.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/media/base/streamparams.h"
 

webrtc/media/base/rtpdataengine.h

@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "webrtc/base/timing.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/mediaengine.h"
 
 namespace cricket {

webrtc/media/base/rtpdataengine_unittest.cc

@@ -16,8 +16,8 @@
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/timing.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtpdataengine.h"
 #include "webrtc/media/base/rtputils.h"
 

webrtc/media/base/videoadapter.cc

@@ -15,7 +15,7 @@
 
 #include "webrtc/base/logging.h"
 #include "webrtc/base/timeutils.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/videocommon.h"
 #include "webrtc/media/base/videoframe.h"
 

webrtc/media/engine/webrtcvoiceengine.cc

@@ -34,7 +34,7 @@
 #include "webrtc/common.h"
 #include "webrtc/media/base/audioframe.h"
 #include "webrtc/media/base/audiorenderer.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/engine/webrtcmediaengine.h"
 #include "webrtc/media/engine/webrtcvoe.h"

webrtc/media/engine/webrtcvoiceengine_unittest.cc

@@ -17,10 +17,10 @@
 #include "webrtc/call.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/test/field_trial.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
 #include "webrtc/media/base/fakertp.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/engine/fakewebrtccall.h"
 #include "webrtc/media/engine/fakewebrtcvoiceengine.h"
 #include "webrtc/media/engine/webrtcvoiceengine.h"

webrtc/media/media.gyp

@@ -37,8 +37,6 @@
         'base/capturemanager.h',
         'base/codec.cc',
         'base/codec.h',
-        'base/constants.cc',
-        'base/constants.h',
         'base/cpuid.cc',
         'base/cpuid.h',
         'base/cryptoparams.h',
@@ -47,6 +45,8 @@
         'base/hybriddataengine.h',
         'base/mediachannel.h',
         'base/mediacommon.h',
+        'base/mediaconstants.cc',
+        'base/mediaconstants.h',
         'base/mediaengine.cc',
         'base/mediaengine.h',
         'base/rtpdataengine.cc',

webrtc/media/sctp/sctpdataengine.cc

@@ -24,7 +24,7 @@
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 
 namespace {

webrtc/media/sctp/sctpdataengine_unittest.cc

@@ -25,8 +25,8 @@
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/thread.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/sctp/sctpdataengine.h"
 
 enum {

webrtc/p2p/base/candidate.h

@@ -19,7 +19,7 @@
 #include <sstream>
 #include <string>
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/network.h"

webrtc/p2p/base/p2pconstants.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 
 #include <string>
 
@@ -32,8 +32,8 @@ const size_t ICE_PWD_MIN_LENGTH = 22;
 const size_t ICE_UFRAG_MAX_LENGTH = 255;
 const size_t ICE_PWD_MAX_LENGTH = 256;
 
-// TODO: This is media-specific, so might belong
-// somewhere like media/base/constants.h
+// This is media-specific, so might belong
+// somewhere like media/base/mediaconstants.h
 const int ICE_CANDIDATE_COMPONENT_RTP = 1;
 const int ICE_CANDIDATE_COMPONENT_RTCP = 2;
 const int ICE_CANDIDATE_COMPONENT_DEFAULT = 1;

webrtc/p2p/base/p2pconstants.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_P2P_BASE_CONSTANTS_H_
-#define WEBRTC_P2P_BASE_CONSTANTS_H_
+#ifndef WEBRTC_P2P_BASE_P2PCONSTANTS_H_
+#define WEBRTC_P2P_BASE_P2PCONSTANTS_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@ extern const char CONNECTIONROLE_HOLDCONN_STR[];
 
 }  // namespace cricket
 
-#endif  // WEBRTC_P2P_BASE_CONSTANTS_H_
+#endif  // WEBRTC_P2P_BASE_P2PCONSTANTS_H_

webrtc/p2p/base/transport.cc

@@ -13,7 +13,7 @@
 #include "webrtc/p2p/base/transport.h"
 
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/bind.h"

webrtc/p2p/base/transport.h

@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
 #include "webrtc/base/messagequeue.h"

webrtc/p2p/base/transportdescription.cc

@@ -12,7 +12,7 @@
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 
 namespace cricket {
 

webrtc/p2p/base/transportdescription.h

@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sslfingerprint.h"
 

webrtc/p2p/base/transportdescriptionfactory_unittest.cc

@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/p2p/base/transportdescriptionfactory.h"
 #include "webrtc/base/fakesslidentity.h"

webrtc/p2p/base/transportinfo.h

@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/base/helpers.h"
 

webrtc/p2p/base/turnport_unittest.cc

@@ -12,7 +12,7 @@
 #endif
 
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/tcpport.h"
 #include "webrtc/p2p/base/testturnserver.h"

webrtc/p2p/client/portallocator_unittest.cc

@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 #include "webrtc/p2p/base/testrelayserver.h"
 #include "webrtc/p2p/base/teststunserver.h"

webrtc/p2p/p2p.gyp

@@ -26,10 +26,10 @@
         'base/basicpacketsocketfactory.h',
         'base/candidate.h',
         'base/common.h',
-        'base/constants.cc',
-        'base/constants.h',
         'base/dtlstransportchannel.cc',
         'base/dtlstransportchannel.h',
+        'base/p2pconstants.cc',
+        'base/p2pconstants.h',
         'base/p2ptransport.cc',
         'base/p2ptransport.h',
         'base/p2ptransportchannel.cc',

webrtc/pc/channel.cc

@@ -20,7 +20,7 @@
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/p2p/base/transportchannel.h"
 #include "webrtc/pc/channelmanager.h"

webrtc/pc/mediasession.cc

@@ -19,9 +19,9 @@
 #include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/cryptoparams.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/pc/channelmanager.h"
 #include "webrtc/pc/srtpfilter.h"
 

webrtc/pc/mediasession.h

@@ -20,9 +20,9 @@
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/cryptoparams.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/mediaengine.h"  // For DataChannelType
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/p2p/base/sessiondescription.h"

webrtc/pc/mediasession_unittest.cc

@@ -17,7 +17,7 @@
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/testutils.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
 #include "webrtc/pc/mediasession.h"