| Index: media/base/media_stub.cc
|
| diff --git a/media/base/media_stub.cc b/media/base/media_stub.cc
|
| index aadfbd1150fa96661595ad2f69f5a77644a99629..284e39fb139f0029b35e56b8d32e9558bc0c69d4 100644
|
| --- a/media/base/media_stub.cc
|
| +++ b/media/base/media_stub.cc
|
| @@ -4,31 +4,17 @@
|
|
|
| #include "media/base/media.h"
|
|
|
| -#include "base/logging.h"
|
| -
|
| -#if defined(OS_ANDROID)
|
| -#include "base/android/jni_android.h"
|
| -#include "media/base/android/media_jni_registrar.h"
|
| -#endif
|
| +#include "base/files/file_path.h"
|
|
|
| // This file is intended for platforms that don't need to load any media
|
| -// libraries (e.g., Android and iOS).
|
| +// libraries (e.g., iOS).
|
| namespace media {
|
| +namespace internal {
|
|
|
| -bool InitializeMediaLibrary(const base::FilePath& module_dir) {
|
| - return true;
|
| -}
|
| -
|
| -void InitializeMediaLibraryForTesting() {
|
| -#if defined(OS_ANDROID)
|
| - // Register JNI bindings for android.
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - RegisterJni(env);
|
| -#endif
|
| -}
|
| -
|
| -bool IsMediaLibraryInitialized() {
|
| +bool InitializeMediaLibraryInternal(const base::FilePath& module_dir,
|
| + bool for_testing) {
|
| return true;
|
| }
|
|
|
| +} // namespace internal
|
| } // namespace media
|
|
|