Merge 142773

Source/WebCore/platform/chromium/support/WebMediaStreamTrack.cpp

 /*
  * Copyright (C) 2013 Google Inc. 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
@@ skipping 41 matching lines @@
 {
     m_private = mediaStreamComponent;
     return *this;
 }
 
 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source)
 {
     m_private = MediaStreamComponent::create(source);
 }
 
+void WebMediaStreamTrack::initialize(const WebString& id, const WebMediaStreamSource& source)
+{
+    m_private = MediaStreamComponent::create(id, source);
+}
+
 void WebMediaStreamTrack::reset()
 {
     m_private.reset();
 }
 
 WebMediaStreamTrack::operator PassRefPtr<MediaStreamComponent>() const
 {
     return m_private.get();
 }
 
@@ skipping 27 matching lines @@
 }
 
 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
 {
     m_private = other.m_private;
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(MEDIA_STREAM)