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

base/trace_event_win_unittest.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 "base/trace_event.h"
+
 #include <strstream>
+
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/event_trace_consumer_win.h"
 #include "base/event_trace_controller_win.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <initguid.h>  // NOLINT - must be last include.
 
 namespace {
 using testing::_;
 using testing::AnyNumber;
 using testing::InSequence;
 using testing::Ge;
 using testing::Le;
@@ skipping 46 matching lines @@
 
  private:
   static TestEventConsumer* current_;
 };
 
 TestEventConsumer* TestEventConsumer::current_ = NULL;
 
 class TraceEventTest: public testing::Test {
  public:
   void SetUp() {
-    bool is_xp = win_util::GetWinVersion() < win_util::WINVERSION_VISTA;
+    bool is_xp = base::win::GetVersion() < base::win::VERSION_VISTA;
 
     // Resurrect and initialize the TraceLog singleton instance.
     // On Vista and better, we need the provider registered before we
     // start the private, in-proc session, but on XP we need the global
     // session created and the provider enabled before we register our
     // provider.
     if (!is_xp) {
       base::TraceLog::Resurrect();
       base::TraceLog* tracelog = base::TraceLog::Get();
       ASSERT_TRUE(tracelog != NULL);
@@ skipping 186 matching lines @@
 
   TRACE_EVENT_INSTANT(kName, kId, kExtra);
   ExpectEvent(base::kTraceEventClass32,
               base::kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   PlayLog();
 }