| Index: content/renderer/media/webmediaplayer_impl.cc
|
| diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
|
| index b7094f6c74259da75fc4b8451584d229647a75dc..5df7125f06bd5189c40bd83feeae3d9034974610 100644
|
| --- a/content/renderer/media/webmediaplayer_impl.cc
|
| +++ b/content/renderer/media/webmediaplayer_impl.cc
|
| @@ -19,6 +19,7 @@
|
| #include "base/message_loop/message_loop_proxy.h"
|
| #include "base/metrics/histogram.h"
|
| #include "base/strings/string_number_conversions.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "cc/layers/video_layer.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -747,7 +748,7 @@ static void ReportMediaKeyExceptionToUMA(const std::string& method,
|
| // Convert a WebString to ASCII, falling back on an empty string in the case
|
| // of a non-ASCII string.
|
| static std::string ToASCIIOrEmpty(const blink::WebString& string) {
|
| - return IsStringASCII(string) ? UTF16ToASCII(string) : std::string();
|
| + return IsStringASCII(string) ? base::UTF16ToASCII(string) : std::string();
|
| }
|
|
|
| WebMediaPlayer::MediaKeyException
|
|
|