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

content/common/content_switches_internal.cc

 // Copyright (c) 2014 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/common/content_switches_internal.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 32 matching lines @@
 #endif
 }
 
 #if defined(OS_WIN)
 
 void DisableWin32kRendererLockdown() {
   g_win32k_renderer_lockdown_disabled = true;
 }
 
 bool IsWin32kRendererLockdownEnabled() {
-  const std::string group_name =
-      base::FieldTrialList::FindFullName("Win32kLockdown");
   if (g_win32k_renderer_lockdown_disabled)
     return false;
   if (base::win::GetVersion() < base::win::VERSION_WIN8)
     return false;
   if (!gfx::win::ShouldUseDirectWrite())
     return false;
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableWin32kRendererLockDown))
-    return true;
   if (cmd_line->HasSwitch(switches::kDisableWin32kRendererLockDown))
     return false;
-  // Default.
-  return group_name != "Disabled";
+  return true;
 }
 #endif
 
 V8CacheOptions GetV8CacheOptions() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   std::string v8_cache_options =
       command_line.GetSwitchValueASCII(switches::kV8CacheOptions);
   if (v8_cache_options.empty())
     v8_cache_options = base::FieldTrialList::FindFullName("V8CacheOptions");
@@ skipping 18 matching lines @@
   } else if (v8_cache_options == "recent") {
     return V8_CACHE_OPTIONS_RECENT;
   } else if (v8_cache_options == "recent-small") {
     return V8_CACHE_OPTIONS_RECENT_SMALL;
   } else {
     return V8_CACHE_OPTIONS_DEFAULT;
   }
 }
 
 } // namespace content