Merge 199462 "Fix libpeerconnection build after a recent libjing..."

third_party/libjingle/overrides/init_webrtc.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "init_webrtc.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
@@ skipping 66 matching lines @@
   return initialize_module(*CommandLine::ForCurrentProcess(),
 #if !defined(OS_MACOSX)
       &Allocate, &Dellocate,
 #endif
       &g_create_webrtc_media_engine, &g_destroy_webrtc_media_engine);
 }
 
 cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
     webrtc::AudioDeviceModule* adm,
     webrtc::AudioDeviceModule* adm_sc,
+    cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory) {
   // For convenience of tests etc, we call InitializeWebRtcModule here.
   // For Chrome however, InitializeWebRtcModule must be called
   // explicitly before the sandbox is initialized.  In that case, this call is
   // effectively a noop.
   InitializeWebRtcModule();
-  return g_create_webrtc_media_engine(adm, adm_sc, decoder_factory);
+  return g_create_webrtc_media_engine(adm, adm_sc, encoder_factory,
+      decoder_factory);
 }
 
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
   g_destroy_webrtc_media_engine(media_engine);
 }
 
 #endif  // LIBPEERCONNECTION_LIB