Cleanup sandbox/ in advance of re-enabling some MSVC warnings.

sandbox/win/src/eat_resolver.cc

 // Copyright (c) 2006-2010 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/eat_resolver.h"
 
 #include "base/win/pe_image.h"
 #include "sandbox/win/src/sandbox_nt_util.h"
 
 namespace sandbox {
 
 NTSTATUS EatResolverThunk::Setup(const void* target_module,
                                  const void* interceptor_module,
                                  const char* target_name,
                                  const char* interceptor_name,
                                  const void* interceptor_entry_point,
                                  void* thunk_storage,
                                  size_t storage_bytes,
                                  size_t* storage_used) {
   NTSTATUS ret = Init(target_module, interceptor_module, target_name,
                       interceptor_name, interceptor_entry_point,
                       thunk_storage, storage_bytes);
   if (!NT_SUCCESS(ret))
     return ret;
 
   if (!eat_entry_)
     return STATUS_INVALID_PARAMETER;
 
-  size_t thunk_bytes = GetInternalThunkSize();
-
 #if defined(_WIN64)
   // We have two thunks, in order: the return path and the forward path.
   if (!SetInternalThunk(thunk_storage, storage_bytes, NULL, target_))
     return STATUS_BUFFER_TOO_SMALL;
 
+  size_t thunk_bytes = GetInternalThunkSize();
   storage_bytes -= thunk_bytes;
   thunk_storage = reinterpret_cast<char*>(thunk_storage) + thunk_bytes;
 #endif
 
   if (!SetInternalThunk(thunk_storage, storage_bytes, target_, interceptor_))
     return STATUS_BUFFER_TOO_SMALL;
 
   AutoProtectMemory memory;
   ret = memory.ChangeProtection(eat_entry_, sizeof(DWORD), PAGE_READWRITE);
   if (!NT_SUCCESS(ret))
@@ skipping 36 matching lines @@
 
 size_t EatResolverThunk::GetThunkSize() const {
 #if defined(_WIN64)
   return GetInternalThunkSize() * 2;
 #else
   return GetInternalThunkSize();
 #endif
 }
 
 }  // namespace sandbox