Ensure that the DirectWrite font cache works in Chrome canary on Windows 8+ with AppContainer prote…

sandbox/win/src/broker_services.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 "sandbox/win/src/broker_services.h"
 
 #include <AclAPI.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 421 matching lines @@
       ++attribute_count;
 
     HANDLE stdout_handle = policy_base->GetStdoutHandle();
     HANDLE stderr_handle = policy_base->GetStderrHandle();
     int inherit_handle_count = 0;
     if (stdout_handle != INVALID_HANDLE_VALUE)
       inherit_handle_list[inherit_handle_count++] = stdout_handle;
     // Handles in the list must be unique.
     if (stderr_handle != stdout_handle && stderr_handle != INVALID_HANDLE_VALUE)
       inherit_handle_list[inherit_handle_count++] = stderr_handle;
+
+    HandleList handle_list = policy_base->GetHandlesBeingShared();
+    if (!handle_list.empty()) {
+      for (size_t i = 0; i < handle_list.size(); ++i)
+        inherit_handle_list[inherit_handle_count++] = handle_list[i];
+    }
     if (inherit_handle_count)
       ++attribute_count;
 
     if (!startup_info.InitializeProcThreadAttributeList(attribute_count))
       return SBOX_ERROR_PROC_THREAD_ATTRIBUTES;
 
     if (app_container) {
       result = app_container->ShareForStartup(&startup_info);
       if (SBOX_ALL_OK != result)
         return result;
@@ skipping 146 matching lines @@
     return SBOX_ERROR_UNSUPPORTED;
 
   base::string16 name = LookupAppContainer(sid);
   if (name.empty())
     return SBOX_ERROR_INVALID_APP_CONTAINER;
 
   return DeleteAppContainer(sid);
 }
 
 }  // namespace sandbox