Tentative revert on branch. Currently this is causing stability issues.

content/browser/gpu/compositor_util.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/browser/gpu/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
@@ skipping 183 matching lines @@
 }
 
 bool IsImplSidePaintingEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   if (command_line.HasSwitch(switches::kDisableImplSidePainting))
     return false;
   else if (command_line.HasSwitch(switches::kEnableImplSidePainting))
     return true;
 
-  return IsThreadedCompositingEnabled();
+#if defined(OS_ANDROID)
+  return true;
+#else
+  return false;
+#endif
 }
 
 bool IsGpuRasterizationEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   if (!IsImplSidePaintingEnabled())
     return false;
 
   if (command_line.HasSwitch(switches::kDisableGpuRasterization))
     return false;
@@ skipping 112 matching lines @@
   return problem_list;
 }
 
 base::Value* GetDriverBugWorkarounds() {
   base::ListValue* workaround_list = new base::ListValue();
   GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(workaround_list);
   return workaround_list;
 }
 
 }  // namespace content