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

snapshot/win/process_reader_win.h

Index: snapshot/win/process_reader_win.h
diff --git a/snapshot/win/process_reader_win.h b/snapshot/win/process_reader_win.h
index 3f49f335924ef9f942760a140498ca0942fdd244..f23d0d5375d496e94357b543747ff9abb753ed27 100644
--- a/snapshot/win/process_reader_win.h
+++ b/snapshot/win/process_reader_win.h
@@ -79,7 +79,7 @@ class ProcessReaderWin {
   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.
   //!
@@ -107,6 +107,9 @@ class ProcessReaderWin {
   const std::vector<ProcessInfo::Module>& Modules();
 
  private:
+  template <class Traits>
+  void ReadThreadData();
+
   HANDLE process_;
   ProcessInfo process_info_;
   std::vector<Thread> threads_;