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

chrome/test/ui/ui_test.cc

 // 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 "chrome/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 32 matching lines @@
 #include "chrome/test/automation/javascript_execution_controller.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/test_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #endif
 
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 
 // Passed as value of kTestType.
 static const char kUITestType[] = "ui";
 
@@ skipping 869 matching lines @@
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
   cmd_line->AppendSwitchASCII("server", "start");
   cmd_line->AppendSwitch("register_cygwin");
   cmd_line->AppendSwitchPath("root", root_directory);
 
   // For Windows 7, if we start the lighttpd server on the foreground mode,
   // it will mess up with the command window and cause conhost.exe to crash. To
   // work around this, we start the http server on the background mode.
 #if defined(OS_WIN)
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7)
+  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     cmd_line->AppendSwitch("run_background");
 #endif
 
   if (port)
     cmd_line->AppendSwitchASCII("port", base::IntToString(port));
 
 #if defined(OS_WIN)
   // TODO(phajdan.jr): is this needed?
   base::LaunchAppWithHandleInheritance(cmd_line->command_line_string(),
                                        true,
@@ skipping 195 matching lines @@
     std::string cookie_value;
     EXPECT_TRUE(tab->GetCookieByName(url, cookie_name, &cookie_value));
     if (!cookie_value.empty())
       return cookie_value;
   }
 
   ADD_FAILURE() << "Timeout reached in WaitUntilCookieNonEmpty";
   return std::string();
 }