Cast: Reshuffle files under media/cast

media/cast/receiver/frame_receiver.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_
 #define MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
-#include "media/cast/base/clock_drift_smoother.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_receiver.h"
+#include "media/cast/common/clock_drift_smoother.h"
+#include "media/cast/common/transport_encryption_handler.h"
 #include "media/cast/framer/framer.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/rtcp/receiver_rtcp_event_subscriber.h"
 #include "media/cast/rtcp/rtcp.h"
 #include "media/cast/rtp_receiver/receiver_stats.h"
 #include "media/cast/rtp_receiver/rtp_parser/rtp_parser.h"
 #include "media/cast/rtp_receiver/rtp_receiver_defines.h"
-#include "media/cast/transport/utility/transport_encryption_handler.h"
 
 namespace media {
 namespace cast {
 
 class CastEnvironment;
 
 // FrameReceiver receives packets out-of-order while clients make requests for
 // complete frames in-order.  (A frame consists of one or more packets.)
 //
 // FrameReceiver also includes logic for computing the playout time for each
@@ skipping 112 matching lines @@
 
   // Assembles packets into frames, providing this receiver with complete,
   // decodable EncodedFrames.
   Framer framer_;
 
   // Manages sending/receiving of RTCP packets, including sender/receiver
   // reports.
   Rtcp rtcp_;
 
   // Decrypts encrypted frames.
-  transport::TransportEncryptionHandler decryptor_;
+  TransportEncryptionHandler decryptor_;
 
   // Outstanding callbacks to run to deliver on client requests for frames.
   std::list<ReceiveEncodedFrameCallback> frame_request_queue_;
 
   // True while there's an outstanding task to re-invoke
   // EmitAvailableEncodedFrames().
   bool is_waiting_for_consecutive_frame_;
 
   // This mapping allows us to log FRAME_ACK_SENT as a frame event. In addition
   // it allows the event to be transmitted via RTCP.
   RtpTimestamp frame_id_to_rtp_timestamp_[256];
 
   // Lip-sync values used to compute the playout time of each frame from its RTP
   // timestamp.  These are updated each time the first packet of a frame is
   // received.
   RtpTimestamp lip_sync_rtp_timestamp_;
   base::TimeTicks lip_sync_reference_time_;
   ClockDriftSmoother lip_sync_drift_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FrameReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameReceiver);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_