Make it possible to use OSMesa on Android

content/shell/app/shell_main_delegate.cc

Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index ab8bd8ecac56400fcd3ae80b6f74474a7a422ac7..ad2b4b8d32c3e9bffa8957192fd5dc79d836084a 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -136,11 +136,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
     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);
@@ -149,9 +146,6 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
 #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)) {
@@ -167,7 +161,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
     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