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

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

Index: third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
index b3e9d341020aa6effc9eb6a8721106cf67ab1548..8802ae5ab92192ec23620a51ebca60cb0147b533 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
@@ -59,7 +59,7 @@ public:
         virtual ~ExtraData() { }
     };
 
-    enum Type {
+    enum StreamType {
         TypeAudio,
         TypeVideo
     };
@@ -70,16 +70,16 @@ public:
         ReadyStateEnded = 2
     };
 
-    static MediaStreamSource* create(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState = ReadyStateLive, bool requiresConsumer = false);
+    static MediaStreamSource* create(const String& id, StreamType, const String& name, bool remote, bool readonly, ReadyState = ReadyStateLive, bool requiresConsumer = false);
 
     const String& id() const { return m_id; }
-    Type type() const { return m_type; }
+    StreamType type() const { return m_type; }
     const String& name() const { return m_name; }
     bool remote() const { return m_remote; }
     bool readonly() const { return m_readonly; }
 
     void setReadyState(ReadyState);
-    ReadyState readyState() const { return m_readyState; }
+    ReadyState getReadyState() const { return m_readyState; }
 
     void addObserver(Observer*);
 
@@ -103,10 +103,10 @@ public:
     DECLARE_TRACE();
 
 private:
-    MediaStreamSource(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState, bool requiresConsumer);
+    MediaStreamSource(const String& id, StreamType, const String& name, bool remote, bool readonly, ReadyState, bool requiresConsumer);
 
     String m_id;
-    Type m_type;
+    StreamType m_type;
     String m_name;
     bool m_remote;
     bool m_readonly;