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

util/win/process_info.h

Index: util/win/process_info.h
diff --git a/util/win/process_info.h b/util/win/process_info.h
index 5d272c422237ab10583b11b814a23261a541eb0c..02514739381e4a6cbbc0c37a63b42e1f3631e053 100644
--- a/util/win/process_info.h
+++ b/util/win/process_info.h
@@ -86,7 +86,12 @@ class ProcessInfo {
   bool Modules(std::vector<Module>* modules) const;
 
  private:
-  template <class T>
+  template <class Traits>
+  friend bool GetProcessBasicInformation(HANDLE process,
+                                         bool is_wow64,
+                                         ProcessInfo* process_info,
+                                         WinVMAddress* peb_address);
+  template <class Traits>
   friend bool ReadProcessData(HANDLE process,
                               WinVMAddress peb_address_vmaddr,
                               ProcessInfo* process_info);