| Index: content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| similarity index 91%
|
| rename from content/renderer/media/media_stream_dependency_factory.h
|
| rename to content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| index 304a401df53d3b10222eafe4adaa5dba8f79c7f1..8cce5cf06233a22832ebf429ec609b9db12a48c0 100644
|
| --- a/content/renderer/media/media_stream_dependency_factory.h
|
| +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| @@ -2,14 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
|
| -#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
|
| +#define CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
|
|
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/files/file.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/threading/thread.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/renderer/render_process_observer.h"
|
| @@ -53,17 +52,14 @@ class WebRtcLoggingMessageFilter;
|
| class WebRtcVideoCapturerAdapter;
|
| struct StreamDeviceInfo;
|
|
|
| -// Object factory for RTC MediaStreams and RTC PeerConnections.
|
| -class CONTENT_EXPORT MediaStreamDependencyFactory
|
| +// Object factory for RTC PeerConnections.
|
| +class CONTENT_EXPORT PeerConnectionDependencyFactory
|
| : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| public RenderProcessObserver {
|
| public:
|
| - // MediaSourcesCreatedCallback is used in CreateNativeMediaSources.
|
| - typedef base::Callback<void(blink::WebMediaStream* web_stream,
|
| - bool live)> MediaSourcesCreatedCallback;
|
| - MediaStreamDependencyFactory(
|
| + PeerConnectionDependencyFactory(
|
| P2PSocketDispatcher* p2p_socket_dispatcher);
|
| - virtual ~MediaStreamDependencyFactory();
|
| + virtual ~PeerConnectionDependencyFactory();
|
|
|
| // Create a RTCPeerConnectionHandler object that implements the
|
| // WebKit WebRTCPeerConnectionHandler interface.
|
| @@ -210,9 +206,9 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
|
|
|
| base::File aec_dump_file_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
|
| + DISALLOW_COPY_AND_ASSIGN(PeerConnectionDependencyFactory);
|
| };
|
|
|
| } // namespace content
|
|
|
| -#endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
|
|
|