| Index: content/common/content_switches_internal.cc
|
| diff --git a/content/common/content_switches_internal.cc b/content/common/content_switches_internal.cc
|
| index 07d064e98eee7876b8839608bf515eba152fcff8..c13396ea3cac087b248c49d79ce8ad0b3e7ef6cc 100644
|
| --- a/content/common/content_switches_internal.cc
|
| +++ b/content/common/content_switches_internal.cc
|
| @@ -50,8 +50,6 @@ void DisableWin32kRendererLockdown() {
|
| }
|
|
|
| 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)
|
| @@ -59,12 +57,9 @@ bool IsWin32kRendererLockdownEnabled() {
|
| 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
|
|
|
|
|