Revert "Revert of Remove font cache code (patchset #3 id:40001 of https://codereview.chromium.org/1…

content/common/sandbox_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 "content/common/sandbox_win.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 14 matching lines @@
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "content/common/content_switches_internal.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/dwrite_font_platform_win.h"
 #include "content/public/common/sandbox_init.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "sandbox/win/src/process_mitigations.h"
 #include "sandbox/win/src/sandbox.h"
 #include "sandbox/win/src/sandbox_nt_util.h"
 #include "sandbox/win/src/sandbox_policy_base.h"
 #include "sandbox/win/src/win_utils.h"
 
 #if !defined(NACL_WIN64)
 #include "ui/gfx/win/direct_write.h" // nogncheck: unused #ifdef NACL_WIN64
@@ skipping 704 matching lines @@
   // process launch.
   base::SharedMemory direct_write_font_cache_section;
   if (type_str == switches::kRendererProcess ||
       type_str == switches::kPpapiPluginProcess) {
     if (gfx::win::ShouldUseDirectWrite()) {
       AddDirectory(base::DIR_WINDOWS_FONTS,
                   NULL,
                   true,
                   sandbox::TargetPolicy::FILES_ALLOW_READONLY,
                   policy);
-
-      if (!ShouldUseDirectWriteFontProxyFieldTrial()) {
-        // If DirectWrite is enabled for font rendering then open the font
-        // cache section which is created by the browser and pass the handle to
-        // the renderer process. This is needed because renderer processes on
-        // Windows 8+ may be running in an AppContainer sandbox and hence their
-        // kernel object namespace may be partitioned.
-        std::string name(content::kFontCacheSharedSectionName);
-        name.append(base::UintToString(base::GetCurrentProcId()));
-
-        if (direct_write_font_cache_section.Open(name, true)) {
-          HANDLE handle = direct_write_font_cache_section.handle().GetHandle();
-          policy->AddHandleToShare(handle);
-          cmd_line->AppendSwitchASCII(
-              switches::kFontCacheSharedHandle,
-              base::UintToString(base::win::HandleToUint32(handle)));
-        }
-      }
     }
   }
 #endif
 
   if (type_str != switches::kRendererProcess) {
     // Hack for Google Desktop crash. Trick GD into not injecting its DLL into
     // this subprocess. See
     // http://code.google.com/p/chromium/issues/detail?id=25580
     cmd_line->AppendSwitchASCII("ignored", " --type=renderer ");
   }
@@ skipping 90 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content