Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: media/cast/test/utility/in_process_receiver.h

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/test/utility/default_config.cc ('k') | media/cast/test/utility/in_process_receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/utility/in_process_receiver.h
diff --git a/media/cast/test/utility/in_process_receiver.h b/media/cast/test/utility/in_process_receiver.h
index cf25da9cee4edebc198da26e67d60981b360bfaa..454dc937ae294f4068a758537465ae675cc70d9c 100644
--- a/media/cast/test/utility/in_process_receiver.h
+++ b/media/cast/test/utility/in_process_receiver.h
@@ -10,7 +10,8 @@
#include "base/memory/weak_ptr.h"
#include "media/base/audio_bus.h"
#include "media/cast/cast_config.h"
-#include "media/cast/transport/cast_transport_config.h"
+#include "media/cast/net/cast_transport_config.h"
+#include "net/base/ip_endpoint.h"
namespace base {
class TimeTicks;
@@ -29,10 +30,7 @@ namespace cast {
class CastEnvironment;
class CastReceiver;
-
-namespace transport {
class UdpTransport;
-} // namespace transport
// Common base functionality for an in-process Cast receiver. This is meant to
// be subclassed with the OnAudioFrame() and OnVideoFrame() methods implemented,
@@ -85,7 +83,7 @@ class InProcessReceiver {
// Callback for the transport to notify of status changes. A default
// implementation is provided here that simply logs socket errors.
- virtual void UpdateCastTransportStatus(transport::CastTransportStatus status);
+ virtual void UpdateCastTransportStatus(CastTransportStatus status);
private:
friend class base::RefCountedThreadSafe<InProcessReceiver>;
@@ -108,7 +106,7 @@ class InProcessReceiver {
const FrameReceiverConfig audio_config_;
const FrameReceiverConfig video_config_;
- scoped_ptr<transport::UdpTransport> transport_;
+ scoped_ptr<UdpTransport> transport_;
scoped_ptr<CastReceiver> cast_receiver_;
// NOTE: Weak pointers must be invalidated before all other member variables.
« no previous file with comments | « media/cast/test/utility/default_config.cc ('k') | media/cast/test/utility/in_process_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698