Clean up now-unused code that was used for libpeerconnection.[so|dll].

BUG=chromium:463660
R=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/56409004

Cr-Commit-Position: refs/heads/master@{#9240}
diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index 87f852c..36a96c5 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -34,7 +34,6 @@
     # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a
     # flood of chromium-style warnings.
     'clang_use_chrome_plugins%': 0,
-    'libpeer_target_type%': 'static_library',
     'conditions': [
       ['OS=="android" or OS=="linux"', {
         'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'include/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a directory containing include/jni.h!\'; print dir")',
@@ -79,10 +78,6 @@
       'HAVE_WEBRTC_VOICE',
     ],
     'conditions': [
-      # TODO(ronghuawu): Support dynamic library build.
-      ['"<(libpeer_target_type)"=="static_library"', {
-        'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
-      }],
       ['OS=="linux"', {
         'defines': [
           'LINUX',
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index e6e6492..9a69e84 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -475,7 +475,6 @@
         'media/webrtc/simulcast.cc',
         'media/webrtc/simulcast.h',
         'media/webrtc/webrtccommon.h',
-        'media/webrtc/webrtcexport.h',
         'media/webrtc/webrtcmediaengine.cc',
         'media/webrtc/webrtcmediaengine.h',
         'media/webrtc/webrtcmediaengine.cc',
diff --git a/talk/media/webrtc/webrtcexport.h b/talk/media/webrtc/webrtcexport.h
deleted file mode 100644
index a2997dc..0000000
--- a/talk/media/webrtc/webrtcexport.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * libjingle
- * Copyright 2004--2013 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  1. Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TALK_MEDIA_WEBRTC_WEBRTCEXPORT_H_
-#define TALK_MEDIA_WEBRTC_WEBRTCEXPORT_H_
-
-// When building for Chrome a part of the code can be built into
-// a shared library, which is controlled by these macros.
-// For all other builds, we always build a static library.
-#if !defined(GOOGLE_CHROME_BUILD) && !defined(CHROMIUM_BUILD)
-#define LIBPEERCONNECTION_LIB 1
-#endif
-
-#ifndef NON_EXPORTED_BASE
-#ifdef WIN32
-
-// MSVC_SUPPRESS_WARNING disables warning |n| for the remainder of the line and
-// for the next line of the source file.
-#define MSVC_SUPPRESS_WARNING(n) __pragma(warning(suppress:n))
-
-// Allows exporting a class that inherits from a non-exported base class.
-// This uses suppress instead of push/pop because the delimiter after the
-// declaration (either "," or "{") has to be placed before the pop macro.
-//
-// Example usage:
-// class EXPORT_API Foo : NON_EXPORTED_BASE(public Bar) {
-//
-// MSVC Compiler warning C4275:
-// non dll-interface class 'Bar' used as base for dll-interface class 'Foo'.
-// Note that this is intended to be used only when no access to the base class'
-// static data is done through derived classes or inline methods. For more info,
-// see http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
-#define NON_EXPORTED_BASE(code) MSVC_SUPPRESS_WARNING(4275) \
-                                code
-
-#else  // Not WIN32
-#define NON_EXPORTED_BASE(code) code
-#endif  // WIN32
-#endif  // NON_EXPORTED_BASE
-
-#if defined (LIBPEERCONNECTION_LIB)
-  #define WRME_EXPORT
-#else
-  #if defined(WIN32)
-    #if defined(LIBPEERCONNECTION_IMPLEMENTATION)
-      #define WRME_EXPORT __declspec(dllexport)
-    #else
-      #define WRME_EXPORT __declspec(dllimport)
-    #endif
-  #else // defined(WIN32)
-    #if defined(LIBPEERCONNECTION_IMPLEMENTATION)
-      #define WRME_EXPORT __attribute__((visibility("default")))
-    #else
-      #define WRME_EXPORT
-    #endif
-  #endif
-#endif  // LIBPEERCONNECTION_LIB
-
-#endif  // TALK_MEDIA_WEBRTC_WEBRTCEXPORT_H_
diff --git a/talk/media/webrtc/webrtcmediaengine.cc b/talk/media/webrtc/webrtcmediaengine.cc
index c5a9430..cf6a5cf 100644
--- a/talk/media/webrtc/webrtcmediaengine.cc
+++ b/talk/media/webrtc/webrtcmediaengine.cc
@@ -25,8 +25,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBPEERCONNECTION_LIB) || defined(LIBPEERCONNECTION_IMPLEMENTATION)
-
 #include "talk/media/webrtc/webrtcmediaengine.h"
 #include "talk/media/webrtc/webrtcvideoengine2.h"
 #include "talk/media/webrtc/webrtcvoiceengine.h"
@@ -47,7 +45,6 @@
 
 }  // namespace cricket
 
-WRME_EXPORT
 cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
     webrtc::AudioDeviceModule* adm,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
@@ -56,7 +53,6 @@
                                          decoder_factory);
 }
 
-WRME_EXPORT
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
   delete media_engine;
 }
@@ -73,6 +69,3 @@
 }
 
 }  // namespace cricket
-
-#endif  // defined(LIBPEERCONNECTION_LIB) ||
-        // defined(LIBPEERCONNECTION_IMPLEMENTATION)
diff --git a/talk/media/webrtc/webrtcmediaengine.h b/talk/media/webrtc/webrtcmediaengine.h
index bdc8356..0fd8a74 100644
--- a/talk/media/webrtc/webrtcmediaengine.h
+++ b/talk/media/webrtc/webrtcmediaengine.h
@@ -29,7 +29,6 @@
 #define TALK_MEDIA_WEBRTCMEDIAENGINE_H_
 
 #include "talk/media/base/mediaengine.h"
-#include "talk/media/webrtc/webrtcexport.h"
 
 namespace webrtc {
 class AudioDeviceModule;
@@ -40,33 +39,11 @@
 class WebRtcVideoEncoderFactory;
 }
 
-#if !defined(LIBPEERCONNECTION_LIB) && \
-    !defined(LIBPEERCONNECTION_IMPLEMENTATION)
-
-WRME_EXPORT
-cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
-    webrtc::AudioDeviceModule* adm,
-    cricket::WebRtcVideoEncoderFactory* encoder_factory,
-    cricket::WebRtcVideoDecoderFactory* decoder_factory);
-
-WRME_EXPORT
-void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine);
-
-#endif  // !defined(LIBPEERCONNECTION_LIB) &&
-        // !defined(LIBPEERCONNECTION_IMPLEMENTATION)
-
 namespace cricket {
 
 class WebRtcMediaEngineFactory {
  public:
-#if !defined(LIBPEERCONNECTION_LIB) && \
-    !defined(LIBPEERCONNECTION_IMPLEMENTATION)
-// A bare Create() isn't supported when using the delegating media
-// engine.
-#else
   static MediaEngineInterface* Create();
-#endif  // !defined(LIBPEERCONNECTION_LIB) &&
-        // !defined(LIBPEERCONNECTION_IMPLEMENTATION)
   static MediaEngineInterface* Create(
       webrtc::AudioDeviceModule* adm,
       WebRtcVideoEncoderFactory* encoder_factory,
@@ -75,121 +52,4 @@
 
 }  // namespace cricket
 
-
-#if !defined(LIBPEERCONNECTION_LIB) && \
-    !defined(LIBPEERCONNECTION_IMPLEMENTATION)
-
-namespace cricket {
-
-// TODO(pthacther): Move this code into webrtcmediaengine.cc once
-// Chrome compiles it.  Right now it relies on only the .h file.
-class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
- public:
-  DelegatingWebRtcMediaEngine(
-      webrtc::AudioDeviceModule* adm,
-      WebRtcVideoEncoderFactory* encoder_factory,
-      WebRtcVideoDecoderFactory* decoder_factory)
-      : delegate_(CreateWebRtcMediaEngine(
-          adm, encoder_factory, decoder_factory)) {
-  }
-  virtual ~DelegatingWebRtcMediaEngine() {
-    DestroyWebRtcMediaEngine(delegate_);
-  }
-  bool Init(rtc::Thread* worker_thread) override {
-    return delegate_->Init(worker_thread);
-  }
-  void Terminate() override { delegate_->Terminate(); }
-  int GetCapabilities() override { return delegate_->GetCapabilities(); }
-  VoiceMediaChannel* CreateChannel() override {
-    return delegate_->CreateChannel();
-  }
-  VideoMediaChannel* CreateVideoChannel(
-      const VideoOptions& options,
-      VoiceMediaChannel* voice_media_channel) override {
-    return delegate_->CreateVideoChannel(options, voice_media_channel);
-  }
-  AudioOptions GetAudioOptions() const override {
-    return delegate_->GetAudioOptions();
-  }
-  bool SetAudioOptions(const AudioOptions& options) override {
-    return delegate_->SetAudioOptions(options);
-  }
-  bool SetAudioDelayOffset(int offset) override {
-    return delegate_->SetAudioDelayOffset(offset);
-  }
-  bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) override {
-    return delegate_->SetDefaultVideoEncoderConfig(config);
-  }
-  bool SetSoundDevices(const Device* in_device,
-                       const Device* out_device) override {
-    return delegate_->SetSoundDevices(in_device, out_device);
-  }
-  bool GetOutputVolume(int* level) override {
-    return delegate_->GetOutputVolume(level);
-  }
-  bool SetOutputVolume(int level) override {
-    return delegate_->SetOutputVolume(level);
-  }
-  int GetInputLevel() override { return delegate_->GetInputLevel(); }
-  bool SetLocalMonitor(bool enable) override {
-    return delegate_->SetLocalMonitor(enable);
-  }
-  const std::vector<AudioCodec>& audio_codecs() override {
-    return delegate_->audio_codecs();
-  }
-  const std::vector<RtpHeaderExtension>& audio_rtp_header_extensions()
-      override {
-    return delegate_->audio_rtp_header_extensions();
-  }
-  const std::vector<VideoCodec>& video_codecs() override {
-    return delegate_->video_codecs();
-  }
-  const std::vector<RtpHeaderExtension>& video_rtp_header_extensions()
-      override {
-    return delegate_->video_rtp_header_extensions();
-  }
-  void SetVoiceLogging(int min_sev, const char* filter) override {
-    delegate_->SetVoiceLogging(min_sev, filter);
-  }
-  void SetVideoLogging(int min_sev, const char* filter) override {
-    delegate_->SetVideoLogging(min_sev, filter);
-  }
-  bool StartAecDump(rtc::PlatformFile file) override {
-    return delegate_->StartAecDump(file);
-  }
-  bool RegisterVoiceProcessor(uint32 ssrc,
-                              VoiceProcessor* video_processor,
-                              MediaProcessorDirection direction) override {
-    return delegate_->RegisterVoiceProcessor(ssrc, video_processor, direction);
-  }
-  bool UnregisterVoiceProcessor(uint32 ssrc,
-                                VoiceProcessor* video_processor,
-                                MediaProcessorDirection direction) override {
-    return delegate_->UnregisterVoiceProcessor(ssrc, video_processor,
-        direction);
-  }
-  virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
-      SignalVideoCaptureStateChange() {
-    return delegate_->SignalVideoCaptureStateChange();
-  }
-
- private:
-  cricket::MediaEngineInterface* delegate_;
-};
-
-// Used by PeerConnectionFactory to create a media engine passed into
-// ChannelManager.
-MediaEngineInterface* WebRtcMediaEngineFactory::Create(
-    webrtc::AudioDeviceModule* adm,
-    WebRtcVideoEncoderFactory* encoder_factory,
-    WebRtcVideoDecoderFactory* decoder_factory) {
-  return new cricket::DelegatingWebRtcMediaEngine(
-      adm, encoder_factory, decoder_factory);
-}
-
-}  // namespace cricket
-
-#endif  // !defined(LIBPEERCONNECTION_LIB) &&
-        // !defined(LIBPEERCONNECTION_IMPLEMENTATION)
-
 #endif  // TALK_MEDIA_WEBRTCMEDIAENGINE_H_
diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h
index 781901e..076922b 100644
--- a/talk/media/webrtc/webrtcvoiceengine.h
+++ b/talk/media/webrtc/webrtcvoiceengine.h
@@ -35,7 +35,6 @@
 
 #include "talk/media/base/rtputils.h"
 #include "talk/media/webrtc/webrtccommon.h"
-#include "talk/media/webrtc/webrtcexport.h"
 #include "talk/media/webrtc/webrtcvoe.h"
 #include "talk/session/media/channel.h"
 #include "webrtc/base/buffer.h"
@@ -48,15 +47,6 @@
 #include "webrtc/common.h"
 #include "webrtc/config.h"
 
-#if !defined(LIBPEERCONNECTION_LIB) && \
-    !defined(LIBPEERCONNECTION_IMPLEMENTATION)
-// If you hit this, then you've tried to include this header from outside
-// the shared library.  An instance of this class must only be created from
-// within the library that actually implements it.  Otherwise use the
-// WebRtcMediaEngine to construct an instance.
-#error "Bogus include."
-#endif
-
 namespace webrtc {
 class VideoEngine;
 }