Reland of move RTPPayloadStrategy and simplify RTPPayloadRegistry

webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h

Index: webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
diff --git a/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h b/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
deleted file mode 100644
index 458f5a8945da79f50283ad2c8fb514a2bbfe8ca5..0000000000000000000000000000000000000000
--- a/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_MOCK_MOCK_RTP_PAYLOAD_STRATEGY_H_
-#define WEBRTC_MODULES_RTP_RTCP_SOURCE_MOCK_MOCK_RTP_PAYLOAD_STRATEGY_H_
-
-#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
-#include "webrtc/test/gmock.h"
-
-namespace webrtc {
-
-class MockRTPPayloadStrategy : public RTPPayloadStrategy {
- public:
-  MOCK_CONST_METHOD0(CodecsMustBeUnique,
-      bool());
-  MOCK_CONST_METHOD4(PayloadIsCompatible,
-                     bool(const RtpUtility::Payload& payload,
-                          uint32_t frequency,
-                          size_t channels,
-                          uint32_t rate));
-  MOCK_CONST_METHOD2(UpdatePayloadRate,
-                     void(RtpUtility::Payload* payload, uint32_t rate));
-  MOCK_CONST_METHOD1(GetPayloadTypeFrequency,
-                     int(const RtpUtility::Payload& payload));
-  MOCK_CONST_METHOD5(
-      CreatePayloadType,
-      RtpUtility::Payload*(const char payload_name[RTP_PAYLOAD_NAME_SIZE],
-                           int8_t payload_type,
-                           uint32_t frequency,
-                           size_t channels,
-                           uint32_t rate));
-};
-
-}  // namespace webrtc
-
-#endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_MOCK_MOCK_RTP_PAYLOAD_STRATEGY_H_