Create a "GetWOW64Status()" utility function and make the rest of the codebas...

sandbox/src/service_resolver_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains unit tests for ServiceResolverThunk.
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
+#include "base/win/windows_version.h"
 #include "sandbox/src/resolver.h"
 #include "sandbox/src/sandbox_utils.h"
 #include "sandbox/src/service_resolver.h"
-#include "sandbox/src/wow64.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // This is the concrete resolver used to perform service-call type functions
 // inside ntdll.dll.
 template<typename T>
 class ResolverThunkTest : public T {
  public:
   // The service resolver needs a child process to write to.
@@ skipping 90 matching lines @@
       ret = resolver->Setup(ntdll_base, NULL, function, NULL, function_entry,
                             thunk.get(), thunk_size, &used);
       CheckJump(service, thunk.get());
     }
   }
 
   return ret;
 }
 
 sandbox::ServiceResolverThunk* GetTestResolver(bool relaxed) {
-  HMODULE ntdll_base = ::GetModuleHandle(L"ntdll.dll");
-  EXPECT_TRUE(NULL != ntdll_base);
-  sandbox::Wow64 WowHelper(NULL, ntdll_base);
-
-  sandbox::ServiceResolverThunk* resolver;
-  if (WowHelper.IsWow64())
-    resolver = new Wow64ResolverTest(relaxed);
-  else if (!sandbox::IsXPSP2OrLater())
-    resolver = new Win2kResolverTest(relaxed);
-  else
-    resolver = new WinXpResolverTest(relaxed);
-  return resolver;
+  if (base::win::GetWOW64Status() == base::win::WOW64_ENABLED)
+    return new Wow64ResolverTest(relaxed);
+  if (!sandbox::IsXPSP2OrLater())
+    return new Win2kResolverTest(relaxed);
+  return new WinXpResolverTest(relaxed);
 }
 
 NTSTATUS PatchNtdll(const char* function, bool relaxed) {
   sandbox::ServiceResolverThunk* resolver = GetTestResolver(relaxed);
 
   NTSTATUS ret = PatchNtdllWithResolver(function, relaxed, resolver);
   delete resolver;
   return ret;
 }
 
@@ skipping 58 matching lines @@
     ::GetLastError();
 
   ret = PatchNtdllWithResolver("NtMapViewOfSection", true, resolver);
   EXPECT_EQ(STATUS_SUCCESS, ret) << "NtMapViewOfSection, last error: " <<
     ::GetLastError();
   delete resolver;
 #endif
 }
 
 }  // namespace