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

chrome/browser/about_flags.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 "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 1436 matching lines @@
      SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)},
     {// TODO(dmazzoni): remove this flag when native android accessibility
      // ships in the stable channel. http://crbug.com/356775
      "enable-accessibility-script-injection",
      IDS_FLAGS_ENABLE_ACCESSIBILITY_SCRIPT_INJECTION_NAME,
      IDS_FLAGS_ENABLE_ACCESSIBILITY_SCRIPT_INJECTION_DESCRIPTION,
      kOsAndroid,
      // Java-only switch: ContentSwitches.ENABLE_ACCESSIBILITY_SCRIPT_INJECTION.
      SINGLE_VALUE_TYPE("enable-accessibility-script-injection")},
 #endif
-    {"enable-one-copy",
-     IDS_FLAGS_ONE_COPY_NAME,
-     IDS_FLAGS_ONE_COPY_DESCRIPTION,
+    {"disable-one-copy",
+     IDS_FLAGS_DISABLE_ONE_COPY_NAME,
+     IDS_FLAGS_DISABLE_ONE_COPY_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kEnableOneCopy)},
+     SINGLE_VALUE_TYPE(switches::kDisableOneCopy)},
     {"enable-zero-copy",
-     IDS_FLAGS_ZERO_COPY_NAME,
-     IDS_FLAGS_ZERO_COPY_DESCRIPTION,
+     IDS_FLAGS_ENABLE_ZERO_COPY_NAME,
+     IDS_FLAGS_ENABLE_ZERO_COPY_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableZeroCopy)},
 #if defined(OS_CHROMEOS)
     {"enable-first-run-ui-transitions",
      IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME,
      IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)},
 #endif
     {"disable-new-bookmark-apps",
@@ skipping 1296 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags