Move webkit/plugins/ppapi to content/renderer/pepper.

content/renderer/media/video_destination_handler.cc

 // Copyright (c) 2013 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.
 
 #include "content/renderer/media/video_destination_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_registry_interface.h"
+#include "content/renderer/pepper/ppb_image_data_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
-#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
 
 using cricket::CaptureState;
 using cricket::VideoFormat;
 using webkit::ppapi::PPB_ImageData_Impl;
 using webrtc::VideoTrackInterface;
 using webrtc::VideoTrackVector;
 
 static const cricket::FourCC kEffectColorFormat = cricket::FOURCC_BGRA;
 
 namespace content {
@@ skipping 50 matching lines @@
   best_format->interval = desired.interval;
   return true;
 }
 
 bool PpFrameWriter::IsScreencast() const {
   return false;
 }
 
 void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data,
                              int64 time_stamp_ns) {
+#if defined(ENABLE_PLUGINS)
   base::AutoLock auto_lock(lock_);
   // This assumes the handler of the SignalFrameCaptured won't call Start/Stop.
   // TODO(ronghuawu): Avoid the using of lock. One way is to post this call to
   // libjingle worker thread, which will require an extra copy of |image_data|.
   // However if pepper host can hand over the ownership of |image_data|
   // then we can avoid this extra copy.
   if (!started_) {
     LOG(ERROR) << "PpFrameWriter::PutFrame - "
                << "Called when capturer is not started.";
     return;
@@ skipping 27 matching lines @@
   } else {
     LOG(ERROR) << "PpFrameWriter::PutFrame - Got RGBA which is not supported.";
     return;
   }
   frame.data_size = bitmap->getSize();
   frame.data = bitmap->getPixels();
 
   // This signals to libJingle that a new VideoFrame is available.
   // libJingle have no assumptions on what thread this signal come from.
   SignalFrameCaptured(this, &frame);
+#endif
 }
 
 // PpFrameWriterProxy is a helper class to make sure the user won't use
 // PpFrameWriter after it is released (IOW its owner - WebMediaStreamTrack -
 // is released).
 class PpFrameWriterProxy : public FrameWriterInterface {
  public:
   PpFrameWriterProxy(VideoTrackInterface* track,
                      PpFrameWriter* writer)
       : track_(track),
@@ skipping 57 matching lines @@
   VideoTrackVector video_tracks = native_stream->GetVideoTracks();
   // Currently one supports one video track per media stream.
   DCHECK(video_tracks.size() == 1);
 
   *frame_writer = new PpFrameWriterProxy(video_tracks[0].get(), writer);
   return true;
 }
 
 }  // namespace content