win x86: Grab bag of restructuring to get tests working on x86-on-x86

snapshot/win/process_reader_win.h

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 61 matching lines @@
   //!
   //! \sa ScopedProcessSuspend
   bool Initialize(HANDLE process, ProcessSuspensionState suspension_state);
 
   //! \return `true` if the target task is a 64-bit process.
   bool Is64Bit() const { return process_info_.Is64Bit(); }
 
   pid_t ProcessID() const { return process_info_.ProcessID(); }
   pid_t ParentProcessID() const { return process_info_.ParentProcessID(); }
 
-  bool ReadMemory(WinVMAddress at, WinVMSize num_bytes, void* into);
+  bool ReadMemory(WinVMAddress at, WinVMSize num_bytes, void* into) const;
 
   //! \brief Determines the target process' start time.
   //!
   //! \param[out] start_time The time that the process started.
   //!
   //! \return `true` on success, `false` on failure, with a warning logged.
   bool StartTime(timeval* start_time) const;
 
   //! \brief Determines the target process' execution time.
   //!
   //! \param[out] user_time The amount of time the process has executed code in
   //!     user mode.
   //! \param[out] system_time The amount of time the process has executed code
   //!     in kernel mode.
   //!
   //! \return `true` on success, `false` on failure, with a warning logged.
   bool CPUTimes(timeval* user_time, timeval* system_time) const;
 
   //! \return The threads that are in the process. The first element (at index
   //!     `0`) corresponds to the main thread.
   const std::vector<Thread>& Threads();
 
   //! \return The modules loaded in the process. The first element (at index
   //!     `0`) corresponds to the main executable.
   const std::vector<ProcessInfo::Module>& Modules();
 
  private:
+  template <class Traits>
+  void ReadThreadData();
+
   HANDLE process_;
   ProcessInfo process_info_;
   std::vector<Thread> threads_;
   std::vector<ProcessInfo::Module> modules_;
   ProcessSuspensionState suspension_state_;
   bool initialized_threads_;
   InitializationStateDcheck initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessReaderWin);
 };
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_SNAPSHOT_WIN_PROCESS_READER_WIN_H_