| Index: content/browser/media/media_canplaytype_browsertest.cc
|
| diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc
|
| index d473584a53259598ff9eaa4ba6a141be334c7a89..87d99691309ed08f5a6ebef57440eca8d9f75241 100644
|
| --- a/content/browser/media/media_canplaytype_browsertest.cc
|
| +++ b/content/browser/media/media_canplaytype_browsertest.cc
|
| @@ -13,39 +13,39 @@
|
| #include "base/android/build_info.h"
|
| #endif
|
|
|
| -const char* kProbably = "probably";
|
| -const char* kMaybe = "maybe";
|
| -const char* kNot = "";
|
| +const char kProbably[] = "probably";
|
| +const char kMaybe[] = "maybe";
|
| +const char kNot[] = "";
|
|
|
| #if defined(USE_PROPRIETARY_CODECS)
|
| -const char* kPropProbably = "probably";
|
| -const char* kPropMaybe = "maybe";
|
| +const char kPropProbably[] = "probably";
|
| +const char kPropMaybe[] = "maybe";
|
| #else
|
| -const char* kPropProbably = "";
|
| -const char* kPropMaybe = "";
|
| +const char kPropProbably[] = "";
|
| +const char kPropMaybe[] = "";
|
| #endif // USE_PROPRIETARY_CODECS
|
|
|
| // TODO(amogh.bihani): Change the opus tests when opus is on
|
| // Android. (http://crbug.com/318436).
|
| #if !defined(OS_ANDROID)
|
| -const char* kOggVideoProbably = "probably";
|
| -const char* kOggVideoMaybe = "maybe";
|
| -const char* kTheoraProbably = "probably";
|
| -const char* kOpusProbably = "probably";
|
| +const char kOggVideoProbably[] = "probably";
|
| +const char kOggVideoMaybe[] = "maybe";
|
| +const char kTheoraProbably[] = "probably";
|
| +const char kOpusProbably[] = "probably";
|
| #if defined(USE_PROPRIETARY_CODECS)
|
| -const char* kTheoraAndPropProbably = "probably";
|
| -const char* kOpusAndPropProbably = "probably";
|
| +const char kTheoraAndPropProbably[] = "probably";
|
| +const char kOpusAndPropProbably[] = "probably";
|
| #else
|
| -const char* kTheoraAndPropProbably = "";
|
| -const char* kOpusAndPropProbably = "";
|
| +const char kTheoraAndPropProbably[] = "";
|
| +const char kOpusAndPropProbably[] = "";
|
| #endif // USE_PROPRIETARY_CODECS
|
| #else
|
| -const char* kOggVideoProbably = "";
|
| -const char* kOggVideoMaybe = "";
|
| -const char* kTheoraProbably = "";
|
| -const char* kOpusProbably = "";
|
| -const char* kTheoraAndPropProbably = "maybe";
|
| -const char* kOpusAndPropProbably = "maybe";
|
| +const char kOggVideoProbably[] = "";
|
| +const char kOggVideoMaybe[] = "";
|
| +const char kTheoraProbably[] = "";
|
| +const char kOpusProbably[] = "";
|
| +const char kTheoraAndPropProbably[] = "maybe";
|
| +const char kOpusAndPropProbably[] = "maybe";
|
| #endif // !OS_ANDROID
|
|
|
| namespace content {
|
|
|