Fixing remaining VC++ 2015 64-bit build breaks

net/cert/test_root_certs_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 "net/cert/test_root_certs.h"
 
 #include <stdint.h>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 82 matching lines @@
 BOOL WINAPI InterceptedOpenStoreW(LPCSTR store_provider,
                                   DWORD encoding,
                                   HCRYPTPROV crypt_provider,
                                   DWORD flags,
                                   const void* store_name,
                                   HCERTSTORE memory_store,
                                   PCERT_STORE_PROV_INFO store_info) {
   // If the high word is all zeroes, then |store_provider| is a numeric ID.
   // Otherwise, it's a pointer to a null-terminated ASCII string. See the
   // documentation for CryptGetOIDFunctionAddress for more information.
-  uint32_t store_as_uint = reinterpret_cast<uint32_t>(store_provider);
+  uintptr_t store_as_uint = reinterpret_cast<uintptr_t>(store_provider);

[Will Harris, 2015/11/10 18:05:14]

store_as_uintptr now :)

[brucedawson, 2015/11/10 18:43:26]

D'oh!

   if (store_as_uint > 0xFFFF || store_provider != CERT_STORE_PROV_SYSTEM_W ||
       !g_capi_injector.Get().original_function)
     return FALSE;
 
   BOOL ok = g_capi_injector.Get().original_function(store_provider, encoding,
                                                     crypt_provider, flags,
                                                     store_name, memory_store,
                                                     store_info);
   // Only the Root store should have certificates injected. If
   // CERT_SYSTEM_STORE_RELOCATE_FLAG is set, then |store_name| points to a
@@ skipping 90 matching lines @@
 
 void TestRootCerts::Init() {
   empty_ = true;
   temporary_roots_ = CertOpenStore(
       CERT_STORE_PROV_MEMORY, 0, NULL,
       CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG, NULL);
   DCHECK(temporary_roots_);
 }
 
 }  // namespace net