Re-land: content: Enable one-copy tile updates on Android.

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 "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 210 matching lines @@
   return cc::MathUtil::ClampToRange(num_raster_threads, kMinRasterThreads,
                                     kMaxRasterThreads);
 }
 
 bool IsOneCopyUploadEnabled() {
   if (IsZeroCopyUploadEnabled())
     return false;
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableOneCopy))
-    return true;
-  if (command_line.HasSwitch(switches::kDisableOneCopy))
-    return false;
-
-#if defined(OS_ANDROID)
-  return false;
-#endif
-  return true;
+  return !command_line.HasSwitch(switches::kDisableOneCopy);
 }
 
 bool IsZeroCopyUploadEnabled() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   return command_line.HasSwitch(switches::kEnableZeroCopy);
 }
 
 bool IsPersistentGpuMemoryBufferEnabled() {
   // Zero copy currently doesn't take advantage of persistent buffers.
@@ skipping 168 matching lines @@
     }
   }
   return problem_list;
 }
 
 std::vector<std::string> GetDriverBugWorkarounds() {
   return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds();
 }
 
 }  // namespace content