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

third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 77 matching lines @@
     m_private.reset();
 }
 
 WebMediaStreamSource::operator MediaStreamSource*() const
 {
     return m_private.get();
 }
 
 void WebMediaStreamSource::initialize(const WebString& id, Type type, const WebString& name)
 {
-    m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::Type>(type), name, false, true);
+    m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::StreamType>(type), name, false, true);
 }
 
 void WebMediaStreamSource::initialize(const WebString& id, Type type, const WebString& name, bool remote, bool readonly)
 {
-    m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::Type>(type), name, remote, readonly);
+    m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::StreamType>(type), name, remote, readonly);
 }
 
 WebString WebMediaStreamSource::id() const
 {
     ASSERT(!m_private.isNull());
     return m_private.get()->id();
 }
 
 WebMediaStreamSource::Type WebMediaStreamSource::type() const
 {
@@ skipping 15 matching lines @@
 
 void WebMediaStreamSource::setReadyState(ReadyState state)
 {
     ASSERT(!m_private.isNull());
     m_private->setReadyState(static_cast<MediaStreamSource::ReadyState>(state));
 }
 
 WebMediaStreamSource::ReadyState WebMediaStreamSource::readyState() const
 {
     ASSERT(!m_private.isNull());
-    return static_cast<ReadyState>(m_private->readyState());
+    return static_cast<ReadyState>(m_private->getReadyState());
 }
 
 WebMediaStreamSource::ExtraData* WebMediaStreamSource::extraData() const
 {
     ASSERT(!m_private.isNull());
     MediaStreamSource::ExtraData* data = m_private->extraData();
     if (!data)
         return 0;
     return static_cast<ExtraDataContainer*>(data)->extraData();
 }
@@ skipping 76 matching lines @@
         ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get());
         if (wrapper->consumer() == consumer) {
             m_private->removeAudioConsumer(wrapper);
             return true;
         }
     }
     return false;
 }
 
 } // namespace blink