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

content/renderer/media/android/webmediaplayer_android.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 144 matching lines @@
   // Getters of playback state.
   bool paused() const override;
   bool seeking() const override;
   double duration() const override;
   virtual double timelineOffset() const;
   double currentTime() const override;
 
   bool didLoadingProgress() override;
 
   // Internal states of loading and network.
-  blink::WebMediaPlayer::NetworkState networkState() const override;
-  blink::WebMediaPlayer::ReadyState readyState() const override;
+  blink::WebMediaPlayer::NetworkState getNetworkState() const override;
+  blink::WebMediaPlayer::ReadyState getReadyState() const override;
 
   bool hasSingleSecurityOrigin() const override;
   bool didPassCORSAccessCheck() const override;
 
   double mediaTimeForTimeValue(double timeValue) const override;
 
   // Provide statistics.
   unsigned decodedFrameCount() const override;
   unsigned droppedFrameCount() const override;
   unsigned audioDecodedByteCount() const override;
@@ skipping 326 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_