Move windows version-related stuff out of base/win_util and into base/win/win...

sandbox/src/registry_dispatcher.cc

-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #include "sandbox/src/registry_dispatcher.h"
 
 #include "base/scoped_handle_win.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "sandbox/src/crosscall_client.h"
 #include "sandbox/src/interception.h"
 #include "sandbox/src/interceptors.h"
 #include "sandbox/src/ipc_tags.h"
 #include "sandbox/src/sandbox_nt_util.h"
 #include "sandbox/src/policy_broker.h"
 #include "sandbox/src/policy_params.h"
 #include "sandbox/src/sandbox.h"
 #include "sandbox/src/registry_interception.h"
 #include "sandbox/src/registry_policy.h"
@@ skipping 37 matching lines @@
   ipc_calls_.push_back(open_params);
 }
 
 bool RegistryDispatcher::SetupService(InterceptionManager* manager,
                                       int service) {
   if (IPC_NTCREATEKEY_TAG == service)
     return INTERCEPT_NT(manager, NtCreateKey, CREATE_KEY_ID, 32);
 
   if (IPC_NTOPENKEY_TAG == service) {
     bool result = INTERCEPT_NT(manager, NtOpenKey, OPEN_KEY_ID, 16);
-    if (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7)
+    if (base::win::GetVersion() >= base::win::VERSION_WIN7)
       result &= INTERCEPT_NT(manager, NtOpenKeyEx, OPEN_KEY_EX_ID, 20);
     return result;
   }
 
   return false;
 }
 
 bool RegistryDispatcher::NtCreateKey(
     IPCInfo* ipc, std::wstring* name, DWORD attributes, HANDLE root,
     DWORD desired_access, DWORD title_index, DWORD create_options) {
@@ skipping 75 matching lines @@
     return true;
   }
 
   // Return operation status on the IPC.
   ipc->return_info.nt_status = nt_status;
   ipc->return_info.handle = handle;
   return true;
 }
 
 }  // namespace sandbox