Rename enums/functions that collide in chromium style in platform/

third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp

 /*
  * Copyright (C) 2012 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
@@ skipping 15 matching lines @@
  * 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.
  */
 
 #include "platform/mediastream/MediaStreamSource.h"
 
 
 namespace blink {
 
-MediaStreamSource* MediaStreamSource::create(const String& id, Type type, const String& name, bool remote, bool readonly, ReadyState readyState, bool requiresConsumer)
+MediaStreamSource* MediaStreamSource::create(const String& id, StreamType type, const String& name, bool remote, bool readonly, ReadyState readyState, bool requiresConsumer)
 {
     return new MediaStreamSource(id, type, name, remote, readonly, readyState, requiresConsumer);
 }
 
-MediaStreamSource::MediaStreamSource(const String& id, Type type, const String& name, bool remote, bool readonly, ReadyState readyState, bool requiresConsumer)
+MediaStreamSource::MediaStreamSource(const String& id, StreamType type, const String& name, bool remote, bool readonly, ReadyState readyState, bool requiresConsumer)
     : m_id(id)
     , m_type(type)
     , m_name(name)
     , m_remote(remote)
     , m_readonly(readonly)
     , m_readyState(readyState)
     , m_requiresConsumer(requiresConsumer)
 {
 }
 
@@ skipping 45 matching lines @@
         (*it)->consumeAudio(bus, numberOfFrames);
 }
 
 DEFINE_TRACE(MediaStreamSource)
 {
     visitor->trace(m_observers);
     visitor->trace(m_audioConsumers);
 }
 
 } // namespace blink