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

snapshot/win/thread_snapshot_win.cc

 // 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 32 matching lines @@
     context_.x86_64 = &context_union_.x86_64;
     InitializeX64Context(process_reader_thread.context, context_.x86_64);
   } else {
     context_.architecture = kCPUArchitectureX86;
     context_.x86 = &context_union_.x86;
     InitializeX86Context(
         *reinterpret_cast<const WOW64_CONTEXT*>(&process_reader_thread.context),
         context_.x86);
   }
 #else
-#error ARCH_CPU_X86
+  context_.architecture = kCPUArchitectureX86;
+  context_.x86 = &context_union_.x86;
+  InitializeX86Context(
+      *reinterpret_cast<const CONTEXT*>(&process_reader_thread.context),
+      context_.x86);
 #endif  // ARCH_CPU_X86_64
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
 }
 
 const CPUContext* ThreadSnapshotWin::Context() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return &context_;
 }
@@ skipping 18 matching lines @@
   return thread_.priority;
 }
 
 uint64_t ThreadSnapshotWin::ThreadSpecificDataAddress() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return thread_.teb;
 }
 
 }  // namespace internal
 }  // namespace crashpad