Fixing remaining VC++ 2015 64-bit build breaks

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 <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 #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"
 #include "ui/gfx/win/direct_write.h"
 
+#if defined(OS_WIN)

[brettw, 2015/11/18 19:24:16]

Ditto

+#include "base/win/win_util.h"
+#endif
 static sandbox::BrokerServices* g_broker_services = NULL;
 static sandbox::TargetServices* g_target_services = NULL;
 
 namespace content {
 namespace {
 
 // The DLLs listed here are known (or under strong suspicion) of causing crashes
 // when they are loaded in the renderer. Note: at runtime we generate short
 // versions of the dll name only if the dll has an extension.
 // For more information about how this list is generated, and how to get off
@@ skipping 687 matching lines @@
       // 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()));
 
       base::SharedMemory direct_write_font_cache_section;
       if (direct_write_font_cache_section.Open(name, true)) {
         void* shared_handle = policy->AddHandleToShare(
             direct_write_font_cache_section.handle().GetHandle());
-        cmd_line->AppendSwitchASCII(switches::kFontCacheSharedHandle,
-            base::UintToString(reinterpret_cast<unsigned int>(shared_handle)));
+        cmd_line->AppendSwitchASCII(
+            switches::kFontCacheSharedHandle,
+            base::UintToString(base::win::HandleToUint32(shared_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 91 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content