| Index: trunk/src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc (revision 273764)
|
| +++ trunk/src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc (working copy)
|
| @@ -279,16 +279,6 @@
|
| scoped_ptr<StartRtpDump::Params> params(StartRtpDump::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| - if (!params->incoming && !params->outgoing) {
|
| - StartRtpDumpCallback(false, "Either incoming or outgoing must be true.");
|
| - return true;
|
| - }
|
| -
|
| - RtpDumpType type =
|
| - (params->incoming && params->outgoing)
|
| - ? RTP_DUMP_BOTH
|
| - : (params->incoming ? RTP_DUMP_INCOMING : RTP_DUMP_OUTGOING);
|
| -
|
| content::RenderProcessHost* host =
|
| RphFromTabIdAndSecurityOrigin(params->tab_id, params->security_origin);
|
| if (!host)
|
| @@ -300,20 +290,14 @@
|
| WebRtcLoggingHandlerHost::GenericDoneCallback callback = base::Bind(
|
| &WebrtcLoggingPrivateStartRtpDumpFunction::StartRtpDumpCallback, this);
|
|
|
| - // This call cannot fail.
|
| - content::RenderProcessHost::WebRtcStopRtpDumpCallback stop_callback =
|
| - host->StartRtpDump(params->incoming,
|
| - params->outgoing,
|
| - base::Bind(&WebRtcLoggingHandlerHost::OnRtpPacket,
|
| - webrtc_logging_handler_host));
|
| -
|
| BrowserThread::PostTask(BrowserThread::IO,
|
| FROM_HERE,
|
| base::Bind(&WebRtcLoggingHandlerHost::StartRtpDump,
|
| webrtc_logging_handler_host,
|
| - type,
|
| - callback,
|
| - stop_callback));
|
| + params->incoming,
|
| + params->outgoing,
|
| + callback));
|
| +
|
| return true;
|
| }
|
|
|
| @@ -336,16 +320,6 @@
|
| scoped_ptr<StopRtpDump::Params> params(StopRtpDump::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| - if (!params->incoming && !params->outgoing) {
|
| - StopRtpDumpCallback(false, "Either incoming or outgoing must be true.");
|
| - return true;
|
| - }
|
| -
|
| - RtpDumpType type =
|
| - (params->incoming && params->outgoing)
|
| - ? RTP_DUMP_BOTH
|
| - : (params->incoming ? RTP_DUMP_INCOMING : RTP_DUMP_OUTGOING);
|
| -
|
| content::RenderProcessHost* host =
|
| RphFromTabIdAndSecurityOrigin(params->tab_id, params->security_origin);
|
| if (!host)
|
| @@ -361,8 +335,10 @@
|
| FROM_HERE,
|
| base::Bind(&WebRtcLoggingHandlerHost::StopRtpDump,
|
| webrtc_logging_handler_host,
|
| - type,
|
| + params->incoming,
|
| + params->outgoing,
|
| callback));
|
| +
|
| return true;
|
| }
|
|
|
|
|