| Index: webrtc/media/webrtc/fakewebrtcvideocapturemodule.h
|
| diff --git a/talk/media/webrtc/fakewebrtcvideocapturemodule.h b/webrtc/media/webrtc/fakewebrtcvideocapturemodule.h
|
| similarity index 62%
|
| rename from talk/media/webrtc/fakewebrtcvideocapturemodule.h
|
| rename to webrtc/media/webrtc/fakewebrtcvideocapturemodule.h
|
| index 7540fcf1d47bfbd7d1332b4f11cbe62daef7e5c2..3bd1876fca8dd12713c926564ac2273f988fd156 100644
|
| --- a/talk/media/webrtc/fakewebrtcvideocapturemodule.h
|
| +++ b/webrtc/media/webrtc/fakewebrtcvideocapturemodule.h
|
| @@ -1,38 +1,21 @@
|
| /*
|
| - * libjingle
|
| - * Copyright 2004 Google Inc.
|
| + * Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
| *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are met:
|
| - *
|
| - * 1. Redistributions of source code must retain the above copyright notice,
|
| - * this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright notice,
|
| - * this list of conditions and the following disclaimer in the documentation
|
| - * and/or other materials provided with the distribution.
|
| - * 3. The name of the author may not be used to endorse or promote products
|
| - * derived from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
| - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
| - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
| - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
| - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * Use of this source code is governed by a BSD-style license
|
| + * that can be found in the LICENSE file in the root of the source
|
| + * tree. An additional intellectual property rights grant can be found
|
| + * in the file PATENTS. All contributing project authors may
|
| + * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef TALK_SESSION_PHONE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
|
| -#define TALK_SESSION_PHONE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
|
| +#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
|
| +#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
|
|
|
| #include <vector>
|
|
|
| -#include "talk/media/base/testutils.h"
|
| -#include "talk/media/webrtc/fakewebrtcdeviceinfo.h"
|
| -#include "talk/media/webrtc/webrtcvideocapturer.h"
|
| +#include "webrtc/media/base/testutils.h"
|
| +#include "webrtc/media/webrtc/fakewebrtcdeviceinfo.h"
|
| +#include "webrtc/media/webrtc/webrtcvideocapturer.h"
|
|
|
| class FakeWebRtcVcmFactory;
|
|
|
| @@ -136,4 +119,4 @@ class FakeWebRtcVideoCaptureModule : public webrtc::VideoCaptureModule {
|
| int delay_;
|
| };
|
|
|
| -#endif // TALK_SESSION_PHONE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
|
| +#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
|
|
|