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..b111ba3c8a0c41b7e5a53d920b28b91cf018ffde 100644
--- a/snapshot/win/process_reader_win.h
+++ b/snapshot/win/process_reader_win.h
@@ -107,6 +107,9 @@ class ProcessReaderWin {
   const std::vector<ProcessInfo::Module>& Modules();
 
  private:
+  template <class Traits>
+  friend void ReadThreadData(ProcessReaderWin* process_reader);
+
   HANDLE process_;
   ProcessInfo process_info_;
   std::vector<Thread> threads_;