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

content/renderer/media/webmediaplayer_ms.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_WEBMEDIAPLAYER_MS_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 101 matching lines @@
   // Dimensions of the video.
   blink::WebSize naturalSize() const override;
 
   // Getters of playback state.
   bool paused() const override;
   bool seeking() const override;
   double duration() const override;
   double currentTime() const 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 didLoadingProgress() override;
 
   bool hasSingleSecurityOrigin() const override;
   bool didPassCORSAccessCheck() const override;
 
   double mediaTimeForTimeValue(double timeValue) const override;
 
   unsigned decodedFrameCount() const override;
   unsigned droppedFrameCount() const override;
@@ skipping 91 matching lines @@
 
   // True if the delegate forced a pause during the last OnHidden() call.
   bool paused_on_hidden_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_