Rename enums/functions that collide in chromium style in core/html/.

third_party/WebKit/Source/core/html/track/TrackBase.h

Index: third_party/WebKit/Source/core/html/track/TrackBase.h
diff --git a/third_party/WebKit/Source/core/html/track/TrackBase.h b/third_party/WebKit/Source/core/html/track/TrackBase.h
index 28db2a6136c775cfdb2813d14d805a00d742e07b..4a71790195bedd7e70d6f4d798051bfa35f33df3 100644
--- a/third_party/WebKit/Source/core/html/track/TrackBase.h
+++ b/third_party/WebKit/Source/core/html/track/TrackBase.h
@@ -42,8 +42,8 @@ public:
 
     WebMediaPlayer::TrackId trackId() const { return m_trackId; }
 
-    enum Type { TextTrack, AudioTrack, VideoTrack };
-    Type type() const { return m_type; }
+    enum TrackType { TextTrack, AudioTrack, VideoTrack };
+    TrackType type() const { return m_type; }
 
     const AtomicString& kind() const { return m_kind; }
     virtual void setKind(const AtomicString&);
@@ -64,14 +64,14 @@ public:
     DECLARE_VIRTUAL_TRACE();
 
 protected:
-    TrackBase(Type, const AtomicString& label, const AtomicString& language, const String& id);
+    TrackBase(TrackType, const AtomicString& label, const AtomicString& language, const String& id);
 
     virtual bool isValidKind(const AtomicString&) const = 0;
     virtual AtomicString defaultKind() const = 0;
 
 private:
     WebMediaPlayer::TrackId m_trackId;
-    Type m_type;
+    TrackType m_type;
     AtomicString m_kind;
     AtomicString m_label;
     AtomicString m_language;