Remove Win32k fieldtrial, flag and switches, and make default enabled.

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 552 matching lines @@
     SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)
   },
 #if defined(OS_WIN)
   {
     "disable-direct-write",
     IDS_FLAGS_DISABLE_DIRECT_WRITE_NAME,
     IDS_FLAGS_DISABLE_DIRECT_WRITE_DESCRIPTION,
     kOsWin,
     SINGLE_VALUE_TYPE(switches::kDisableDirectWrite)
   },
-  {
-    "enable-win32k-renderer-lockdown",
-    IDS_FLAGS_ENABLE_WIN32K_RENDERER_LOCKDOWN_NAME,

[Lei Zhang, 2015/05/13 17:19:49]

Remove the resources from the .grd file?

[Will Harris, 2015/05/13 17:22:56]

Ah yes, good spot. Thanks!

-    IDS_FLAGS_ENABLE_WIN32K_RENDERER_LOCKDOWN_DESCRIPTION,
-    kOsWin,
-    ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWin32kRendererLockDown,
-                              switches::kDisableWin32kRendererLockDown)
-  },
 #endif
   {
     "enable-experimental-canvas-features",
     IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME,
     IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)
   },
   {
     "disable-accelerated-2d-canvas",
@@ skipping 2435 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags