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 b5fbb8eccb85f1e6fc0d8494189da9e504a3ea8b..c56ffcab3435a55ea1a12f75ff8a5eba5dd03dd3 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -119,11 +119,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);
@@ -132,9 +129,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)) {