Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(730)

Unified Diff: media/base/media_stub.cc

Issue 14891002: Remove function level static initializers media library initialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar typos. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698