| Index: webrtc/media/base/mediaengine.h
 | 
| diff --git a/talk/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h
 | 
| similarity index 76%
 | 
| rename from talk/media/base/mediaengine.h
 | 
| rename to webrtc/media/base/mediaengine.h
 | 
| index 3f7eec239b4b5b0c9228ce424c1abf9f0ec40f7e..5c9aa913525875e8b2713db46a95d1bc56df3a27 100644
 | 
| --- a/talk/media/base/mediaengine.h
 | 
| +++ b/webrtc/media/base/mediaengine.h
 | 
| @@ -1,32 +1,15 @@
 | 
|  /*
 | 
| - * 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_MEDIA_BASE_MEDIAENGINE_H_
 | 
| -#define TALK_MEDIA_BASE_MEDIAENGINE_H_
 | 
| +#ifndef WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
 | 
| +#define WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
 | 
|  
 | 
|  #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 | 
|  #include <CoreAudio/CoreAudio.h>
 | 
| @@ -35,15 +18,15 @@
 | 
|  #include <string>
 | 
|  #include <vector>
 | 
|  
 | 
| -#include "talk/media/base/codec.h"
 | 
| -#include "talk/media/base/mediachannel.h"
 | 
| -#include "talk/media/base/mediacommon.h"
 | 
| -#include "talk/media/base/videocapturer.h"
 | 
| -#include "talk/media/base/videocommon.h"
 | 
| -#include "talk/media/devices/devicemanager.h"
 | 
|  #include "webrtc/audio_state.h"
 | 
|  #include "webrtc/base/fileutils.h"
 | 
|  #include "webrtc/base/sigslotrepeater.h"
 | 
| +#include "webrtc/media/base/codec.h"
 | 
| +#include "webrtc/media/base/mediachannel.h"
 | 
| +#include "webrtc/media/base/mediacommon.h"
 | 
| +#include "webrtc/media/base/videocapturer.h"
 | 
| +#include "webrtc/media/base/videocommon.h"
 | 
| +#include "webrtc/media/devices/devicemanager.h"
 | 
|  
 | 
|  #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
 | 
|  #define DISABLE_MEDIA_ENGINE_FACTORY
 | 
| @@ -221,4 +204,4 @@ class DataEngineInterface {
 | 
|  
 | 
|  }  // namespace cricket
 | 
|  
 | 
| -#endif  // TALK_MEDIA_BASE_MEDIAENGINE_H_
 | 
| +#endif  // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
 | 
| 
 |