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

chrome/browser/bug_report_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_BUG_REPORT_UTIL_H_
 #define CHROME_BROWSER_BUG_REPORT_UTIL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #include "base/sys_info.h"
+#elif defined(OS_WIN)
+#include "base/win/windows_version.h"
 #endif
 #include "chrome/browser/userfeedback/proto/common.pb.h"
 #include "chrome/browser/userfeedback/proto/extension.pb.h"
 #include "chrome/browser/userfeedback/proto/math.pb.h"
 #include "gfx/rect.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/syslogs_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
@@ skipping 22 matching lines @@
     CANT_SIGN_IN,
     CHROME_MISBEHAVES,
     SOMETHING_MISSING,
     BROWSER_CRASH,
     OTHER_PROBLEM
   };
 #endif
 
   // SetOSVersion copies the maj.minor.build + servicePack_string
   // into a string. We currently have:
-  //   win_util::GetWinVersion returns WinVersion, which is just
+  //   base::win::GetVersion returns WinVersion, which is just
   //     an enum of 2000, XP, 2003, or VISTA. Not enough detail for
   //     bug reports.
   //   base::SysInfo::OperatingSystemVersion returns an std::string
   //     but doesn't include the build or service pack. That function
   //     is probably the right one to extend, but will require changing
   //     all the call sites or making it a wrapper around another util.
   static void SetOSVersion(std::string *os_version);
 
   // This sets the address of the feedback server to be used by SendReport
   static void SetFeedbackServer(const std::string& server);
@@ skipping 32 matching lines @@
 #if defined(OS_CHROMEOS)
   static bool ValidFeedbackSize(const std::string& content);
 #endif
 
   static std::string feedback_server_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(BugReportUtil);
 };
 
 #endif  // CHROME_BROWSER_BUG_REPORT_UTIL_H_