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

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

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * 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.
@@ skipping 41 matching lines @@
         virtual ~Observer() { }
         virtual void sourceChangedState() = 0;
     };
 
     class ExtraData {
         USING_FAST_MALLOC(ExtraData);
     public:
         virtual ~ExtraData() { }
     };
 
-    enum Type {
+    enum StreamType {
         TypeAudio,
         TypeVideo
     };
 
     enum ReadyState {
         ReadyStateLive = 0,
         ReadyStateMuted = 1,
         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*);
 
     ExtraData* extraData() const { return m_extraData.get(); }
     void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = std::move(extraData); }
 
     void setConstraints(WebMediaConstraints constraints) { m_constraints = constraints; }
     WebMediaConstraints constraints() { return m_constraints; }
 
     void setAudioFormat(size_t numberOfChannels, float sampleRate);
     void consumeAudio(AudioBus*, size_t numberOfFrames);
 
     bool requiresAudioConsumer() const { return m_requiresConsumer; }
     void addAudioConsumer(AudioDestinationConsumer*);
     bool removeAudioConsumer(AudioDestinationConsumer*);
     const HeapHashSet<Member<AudioDestinationConsumer>>& audioConsumers() { return m_audioConsumers; }
 
     // |m_extraData| may hold pointers to GC objects, and it may touch them in destruction.
     // So this class is eagerly finalized to finalize |m_extraData| promptly.
     EAGERLY_FINALIZE();
     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;
     ReadyState m_readyState;
     bool m_requiresConsumer;
     HeapHashSet<WeakMember<Observer>> m_observers;
     Mutex m_audioConsumersLock;
     HeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers;
     OwnPtr<ExtraData> m_extraData;
     WebMediaConstraints m_constraints;
 };
 
 typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector;
 
 } // namespace blink
 
 #endif // MediaStreamSource_h