Upstreaming WebKit.gyp

chrome/renderer/webmediaplayer_impl.h

 // Copyright (c) 2008-2009 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.
 //
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains PipelineImpl which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // PipelineImpl would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 32 matching lines @@
 #ifndef CHROME_RENDERER_WEBMEDIAPLAYER_IMPL_H_
 #define CHROME_RENDERER_WEBMEDIAPLAYER_IMPL_H_
 
 #include <vector>
 
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline_impl.h"
 #include "skia/ext/platform_canvas.h"
-#include "webkit/api/public/WebMediaPlayer.h"
-#include "webkit/api/public/WebMediaPlayerClient.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h"
 
 class AudioRendererImpl;
 class DataSourceImpl;
 class GURL;
 class RenderView;
 class VideoRendererImpl;
 
 namespace media {
 class FilterFactoryCollection;
 }
@@ skipping 128 matching lines @@
   // |main_loop_|. |tasks_| can be access from main thread or the media threads
   // we need a lock for protecting it.
   Lock task_lock_;
   typedef std::vector<CancelableTask*> CancelableTaskList;
   CancelableTaskList tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 #endif  // CHROME_RENDERER_WEBMEDIAPLAYER_IMPL_H_