Make it possible to use OSMesa on Android

content/shell/app/shell_main_delegate.cc

 // Copyright (c) 2012 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/shell/app/shell_main_delegate.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ skipping 118 matching lines @@
       return true;
     }
   }
 
   if (command_line.HasSwitch(switches::kDumpRenderTree)) {
     EnableBrowserLayoutTestMode();
 
     command_line.AppendSwitch(switches::kProcessPerTab);
     command_line.AppendSwitch(switches::kEnableLogging);
     command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
-#if !defined(OS_ANDROID)
-    // OSMesa is not yet available for Android. http://crbug.com/248925
-    command_line.AppendSwitchASCII(
-        switches::kUseGL, gfx::kGLImplementationOSMesaName);
-#endif
+    command_line.AppendSwitchASCII(switches::kUseGL,
+                                   gfx::kGLImplementationOSMesaName);
     command_line.AppendSwitch(switches::kSkipGpuDataLoading);
     command_line.AppendSwitchASCII(switches::kTouchEvents,
                                    switches::kTouchEventsEnabled);
     command_line.AppendSwitch(switches::kEnableGestureTapHighlight);
     command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
 #if defined(OS_ANDROID)
     command_line.AppendSwitch(
         switches::kDisableGestureRequirementForMediaPlayback);
-    // Capturing pixel results does not yet work when implementation-side
-    // painting is enabled. See http://crbug.com/250777
-    command_line.AppendSwitch(cc::switches::kDisableImplSidePainting);
 #endif
 
     if (!command_line.HasSwitch(switches::kStableReleaseMode)) {
       command_line.AppendSwitch(
         switches::kEnableExperimentalWebPlatformFeatures);
     }
 
     if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) {
       command_line.AppendSwitch(switches::kDisableThreadedCompositing);
       command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
     }
 
     command_line.AppendSwitch(switches::kEnableInbandTextTracks);
     command_line.AppendSwitch(switches::kMuteAudio);
 
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_ANDROID)
     // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
     command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
 #endif
 
     command_line.AppendSwitch(switches::kEnableFileCookies);
 
     // Unless/until WebM files are added to the media layout tests, we need to
     // avoid removing MP4/H264/AAC so that layout tests can run on Android.
 #if !defined(OS_ANDROID)
     net::RemoveProprietaryMediaTypesAndCodecsForTests();
@@ skipping 110 matching lines @@
   browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
 
 }  // namespace content