Implement fallback from WMPI to WMPA.

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 899 matching lines @@
   if (ShouldUseWarp())
     return true;
   if (ShouldUseSwiftShader())
     return false;
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING))
     return false;
   return true;
 }
 
 
 bool GpuDataManagerImplPrivate::ShouldDisableAcceleratedVideoDecode(

[sandersd (OOO until July 31), 2016/01/06 00:56:20]

I'm not certain that this is the best place.

     const base::CommandLine* command_line) const {
   // Make sure that we initialize the experiment first to make sure that
   // statistics are bucket correctly in all cases.
   // This experiment is temporary and will be removed once enough data
   // to resolve crbug/442039 has been collected.
   const std::string group_name = base::FieldTrialList::FindFullName(
       "DisableAcceleratedVideoDecode");
   if (command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) {
     // It was already disabled on the command line.
     return false;
   }
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE))
     return true;
   if (group_name == "Disabled")
     return true;
+#if defined(OS_ANDROID)
+  if (command_line->HasSwitch(switches::kDisableGpu) ||

[sandersd (OOO until July 31), 2016/01/06 00:56:20]

This one should probably apply to all platforms?

+      command_line->HasSwitch(switches::kSingleProcess) ||
+      command_line->HasSwitch(switches::kInProcessGPU)) {
+    return true;
+  }
+#endif  // defined(OS_ANDROID)
   return false;
 }
 
 void GpuDataManagerImplPrivate::GetDisabledExtensions(
     std::string* disabled_extensions) const {
   DCHECK(disabled_extensions);
   *disabled_extensions = disabled_extensions_;
 }
 
 void GpuDataManagerImplPrivate::BlockDomainFrom3DAPIs(
@@ skipping 280 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content