Switch from build-time to run-time flags for Project Spitzer.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 9e2bdcb4ebde5d5b13d6e01d8712b0a9f8af7f53..2419cd0f3465dae42eafdaee088c20ae8a9d21de 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2068,6 +2068,12 @@ const FeatureEntry kFeatureEntries[] = {
       ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
                                 switches::kDisableInputImeAPI)},
 #endif // defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_ANDROID)
+    {"enable-unified-media-pipeline",
+     IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_NAME,
+     IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid,
+     SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)},
+#endif  // OS_ANDROID
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.