| Index: webrtc/api/webrtcsession_unittest.cc
|
| diff --git a/talk/app/webrtc/webrtcsession_unittest.cc b/webrtc/api/webrtcsession_unittest.cc
|
| similarity index 98%
|
| rename from talk/app/webrtc/webrtcsession_unittest.cc
|
| rename to webrtc/api/webrtcsession_unittest.cc
|
| index ed089ef1d4e9019da73cf62c22d9bfd77cdb3a80..f4cd7899785789bbcac1fe9a2c469eb5c92e4a6f 100644
|
| --- a/talk/app/webrtc/webrtcsession_unittest.cc
|
| +++ b/webrtc/api/webrtcsession_unittest.cc
|
| @@ -1,56 +1,34 @@
|
| /*
|
| - * libjingle
|
| - * Copyright 2012 Google Inc.
|
| + * Copyright 2012 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.
|
| */
|
|
|
| #include <utility>
|
| #include <vector>
|
|
|
| -#include "talk/app/webrtc/audiotrack.h"
|
| -#include "talk/app/webrtc/fakemediacontroller.h"
|
| -#include "talk/app/webrtc/fakemetricsobserver.h"
|
| -#include "talk/app/webrtc/jsepicecandidate.h"
|
| -#include "talk/app/webrtc/jsepsessiondescription.h"
|
| -#include "talk/app/webrtc/peerconnection.h"
|
| -#include "talk/app/webrtc/sctputils.h"
|
| -#include "talk/app/webrtc/streamcollection.h"
|
| -#include "talk/app/webrtc/streamcollection.h"
|
| -#include "talk/app/webrtc/test/fakeconstraints.h"
|
| -#include "talk/app/webrtc/test/fakedtlsidentitystore.h"
|
| -#include "talk/app/webrtc/videotrack.h"
|
| -#include "talk/app/webrtc/webrtcsession.h"
|
| -#include "talk/app/webrtc/webrtcsessiondescriptionfactory.h"
|
| +#include "webrtc/api/audiotrack.h"
|
| +#include "webrtc/api/fakemediacontroller.h"
|
| +#include "webrtc/api/fakemetricsobserver.h"
|
| +#include "webrtc/api/jsepicecandidate.h"
|
| +#include "webrtc/api/jsepsessiondescription.h"
|
| +#include "webrtc/api/peerconnection.h"
|
| +#include "webrtc/api/sctputils.h"
|
| +#include "webrtc/api/streamcollection.h"
|
| +#include "webrtc/api/streamcollection.h"
|
| +#include "webrtc/api/test/fakeconstraints.h"
|
| +#include "webrtc/api/test/fakedtlsidentitystore.h"
|
| +#include "webrtc/api/videotrack.h"
|
| +#include "webrtc/api/webrtcsession.h"
|
| +#include "webrtc/api/webrtcsessiondescriptionfactory.h"
|
| #include "talk/media/base/fakemediaengine.h"
|
| #include "talk/media/base/fakevideorenderer.h"
|
| #include "talk/media/base/mediachannel.h"
|
| #include "talk/media/webrtc/fakewebrtccall.h"
|
| -#include "webrtc/p2p/base/stunserver.h"
|
| -#include "webrtc/p2p/base/teststunserver.h"
|
| -#include "webrtc/p2p/base/testturnserver.h"
|
| -#include "webrtc/p2p/base/transportchannel.h"
|
| -#include "webrtc/p2p/client/basicportallocator.h"
|
| #include "talk/session/media/channelmanager.h"
|
| #include "talk/session/media/mediasession.h"
|
| #include "webrtc/base/fakenetwork.h"
|
| @@ -65,6 +43,11 @@
|
| #include "webrtc/base/stringutils.h"
|
| #include "webrtc/base/thread.h"
|
| #include "webrtc/base/virtualsocketserver.h"
|
| +#include "webrtc/p2p/base/stunserver.h"
|
| +#include "webrtc/p2p/base/teststunserver.h"
|
| +#include "webrtc/p2p/base/testturnserver.h"
|
| +#include "webrtc/p2p/base/transportchannel.h"
|
| +#include "webrtc/p2p/client/basicportallocator.h"
|
|
|
| #define MAYBE_SKIP_TEST(feature) \
|
| if (!(feature())) { \
|
|
|