Commit 5afaa927 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Remove using-declaration to resolve conflict

When building using Jumbo, the using-declaration
of api::webrtc_logging_private::RequestInfo
results in a conflict, since a declaration of
RequestInfo exists in both api/webrtc_logging_private.h
and api/webrtc_audio_private.h. This commit solves the
conflict by removing the using-declaration.

Bug: 850484
Change-Id: I9bc25994cccdfd2e9ae19ecdacde06ed7780b1b2
Reviewed-on: https://chromium-review.googlesource.com/1098658Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#567167}
parent 1b0d9074
...@@ -51,7 +51,6 @@ bool CanEnableAudioDebugRecordingsFromExtension( ...@@ -51,7 +51,6 @@ bool CanEnableAudioDebugRecordingsFromExtension(
namespace extensions { namespace extensions {
using api::webrtc_logging_private::MetaDataEntry; using api::webrtc_logging_private::MetaDataEntry;
using api::webrtc_logging_private::RequestInfo;
using content::BrowserThread; using content::BrowserThread;
namespace Discard = api::webrtc_logging_private::Discard; namespace Discard = api::webrtc_logging_private::Discard;
...@@ -82,7 +81,8 @@ std::string HashIdWithOrigin(const std::string& security_origin, ...@@ -82,7 +81,8 @@ std::string HashIdWithOrigin(const std::string& security_origin,
// TODO(hlundin): Consolidate with WebrtcAudioPrivateFunction and improve. // TODO(hlundin): Consolidate with WebrtcAudioPrivateFunction and improve.
// http://crbug.com/710371 // http://crbug.com/710371
content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest( content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
const RequestInfo& request, const std::string& security_origin) { const api::webrtc_logging_private::RequestInfo& request,
const std::string& security_origin) {
// There are 2 ways these API functions can get called. // There are 2 ways these API functions can get called.
// //
// 1. From a whitelisted component extension on behalf of a page with the // 1. From a whitelisted component extension on behalf of a page with the
...@@ -188,7 +188,8 @@ WebrtcLoggingPrivateFunction::LoggingHandlerFromRequest( ...@@ -188,7 +188,8 @@ WebrtcLoggingPrivateFunction::LoggingHandlerFromRequest(
scoped_refptr<WebRtcLoggingHandlerHost> scoped_refptr<WebRtcLoggingHandlerHost>
WebrtcLoggingPrivateFunctionWithGenericCallback::PrepareTask( WebrtcLoggingPrivateFunctionWithGenericCallback::PrepareTask(
const RequestInfo& request, const std::string& security_origin, const api::webrtc_logging_private::RequestInfo& request,
const std::string& security_origin,
WebRtcLoggingHandlerHost::GenericDoneCallback* callback) { WebRtcLoggingHandlerHost::GenericDoneCallback* callback) {
*callback = base::Bind( *callback = base::Bind(
&WebrtcLoggingPrivateFunctionWithGenericCallback::FireCallback, this); &WebrtcLoggingPrivateFunctionWithGenericCallback::FireCallback, this);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment