Merge 226626 "Remove disable-gpu-vsync about:flags entry"

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 <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 425 matching lines @@
     SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)
   },
   {
     "accelerated-filters",
     IDS_FLAGS_ACCELERATED_FILTERS,
     IDS_FLAGS_ACCELERATED_FILTERS_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableAcceleratedFilters)
   },
   {
-    "disable-gpu-vsync",
-    IDS_FLAGS_DISABLE_GPU_VSYNC_NAME,
-    IDS_FLAGS_DISABLE_GPU_VSYNC_DESCRIPTION,
-    kOsDesktop,
-    SINGLE_VALUE_TYPE(switches::kDisableGpuVsync)
-  },
-  {
     "disable-webgl",
     IDS_FLAGS_DISABLE_WEBGL_NAME,
     IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
   },
   {
     "enable-d3d11",
     IDS_FLAGS_ENABLE_D3D11_NAME,
     IDS_FLAGS_ENABLE_D3D11_DESCRIPTION,
@@ skipping 1797 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags