Disable Win32k renderer lockdown if DirectWrite is disabled.

chrome/browser/chrome_browser_main_win.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/chrome_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 219 matching lines @@
 
   // Windows 8+ provides a mode where by a process cannot call Win32K/GDI
   // functions in the kernel (win32k.sys). If we are on Windows 8+ and if
   // we are launched with the kEnableWin32kRendererLockDown switch then we
   // force the PDF pepper plugin to run out of process. This is because the
   // PDF plugin uses GDI for text rendering which does not work in the
   // Win32K lockdown mode. Running it out of process ensures that the process
   // launched for the plugin does not have the Win32K lockdown mode enabled.
   // TODO(ananta)
   // Revisit this when the pdf plugin uses skia and stops using GDI.
-  if (switches::IsWin32kRendererLockdownEnabled() &&
-      base::win::GetVersion() >= base::win::VERSION_WIN8) {
+  if (switches::IsWin32kRendererLockdownEnabled(false)) {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableOutOfProcessPdf);
   }
   return rv;
 }
 
 void ChromeBrowserMainPartsWin::ShowMissingLocaleMessageBox() {
   ui::MessageBox(NULL,
                  base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
                  base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
@@ skipping 16 matching lines @@
           base::Bind(ExecuteFontCacheBuildTask, path));
     }
   }
 }
 
 void ChromeBrowserMainPartsWin::PostBrowserStart() {
   ChromeBrowserMainParts::PostBrowserStart();
 
   UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice());
   UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown",
-                        switches::IsWin32kRendererLockdownEnabled());
+                        switches::IsWin32kRendererLockdownEnabled(false));
 
   // Set up a task to verify installed modules in the current process. Use a
   // delay to reduce the impact on startup time.
   content::BrowserThread::GetMessageLoopProxyForThread(
       content::BrowserThread::UI)->PostDelayedTask(
           FROM_HERE,
           base::Bind(&VerifyInstallation),
           base::TimeDelta::FromSeconds(45));
 
   InitializeChromeElf();
@@ skipping 186 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return base::string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }