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 c6d578a90f430aba25348431c49a5a4b63796195..d1fd89cc27e0c7594a982998770f4c8448e9d3e5 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -140,11 +140,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.AppendSwitch(switches::kSkipGpuDataLoading);
     command_line.AppendSwitchASCII(switches::kTouchEvents,
                                    switches::kTouchEventsEnabled);
@@ -153,9 +150,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)) {