Removing useless Win7 checks + standardize its use

remoting/base/auto_thread_unittest.cc

 // Copyright (c) 2012 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 "remoting/base/auto_thread.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/scoped_native_library.h"
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <objbase.h>
-#include "base/win/windows_version.h"
 #endif
 
 namespace {
 
 const char kThreadName[] = "Test thread";
 
 void SetFlagTask(bool* success) {
   *success = true;
 }
 
 void PostSetFlagTask(
     scoped_refptr<base::TaskRunner> task_runner,
     bool* success) {
   task_runner->PostTask(FROM_HERE, base::Bind(&SetFlagTask, success));
 }
 
 #if defined(OS_WIN)
 void CheckComAptTypeTask(APTTYPE* apt_type_out, HRESULT* hresult) {
   typedef HRESULT (WINAPI * CoGetApartmentTypeFunc)
       (APTTYPE*, APTTYPEQUALIFIER*);
 
-  // CoGetApartmentType requires Windows 7 or above.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7) {
-    *hresult = E_NOTIMPL;
-    return;
-  }
-
   // Dynamic link to the API so the same test binary can run on older systems.
   base::ScopedNativeLibrary com_library(base::FilePath(L"ole32.dll"));
   ASSERT_TRUE(com_library.is_valid());
   CoGetApartmentTypeFunc co_get_apartment_type =
       reinterpret_cast<CoGetApartmentTypeFunc>(
           com_library.GetFunctionPointer("CoGetApartmentType"));
   ASSERT_TRUE(co_get_apartment_type != NULL);
 
   APTTYPEQUALIFIER apt_type_qualifier;
   *hresult = (*co_get_apartment_type)(apt_type_out, &apt_type_qualifier);
@@ skipping 102 matching lines @@
 
   // Post a task to query the COM apartment type.
   HRESULT hresult = E_FAIL;
   APTTYPE apt_type = APTTYPE_NA;
   task_runner->PostTask(FROM_HERE,
                         base::Bind(&CheckComAptTypeTask, &apt_type, &hresult));
 
   task_runner = NULL;
   RunMessageLoop();
 
-  // CoGetApartmentType requires Windows 7 or above.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
-    EXPECT_EQ(S_OK, hresult);
-    EXPECT_EQ(APTTYPE_MTA, apt_type);
-  } else {
-    EXPECT_EQ(E_NOTIMPL, hresult);
-  }
+  EXPECT_EQ(S_OK, hresult);
+  EXPECT_EQ(APTTYPE_MTA, apt_type);
 }
 
 TEST_F(AutoThreadTest, ThreadWithComSta) {
   scoped_refptr<base::TaskRunner> task_runner =
       AutoThread::CreateWithLoopAndComInitTypes(kThreadName,
                                                 main_task_runner_,
                                                 base::MessageLoop::TYPE_UI,
                                                 AutoThread::COM_INIT_STA);
   EXPECT_TRUE(task_runner.get());
 
   // Post a task to query the COM apartment type.
   HRESULT hresult = E_FAIL;
   APTTYPE apt_type = APTTYPE_NA;
   task_runner->PostTask(FROM_HERE,
                         base::Bind(&CheckComAptTypeTask, &apt_type, &hresult));
 
   task_runner = NULL;
   RunMessageLoop();
 
-  // CoGetApartmentType requires Windows 7 or above.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
-    EXPECT_EQ(S_OK, hresult);
-    // Whether the thread is the "main" STA apartment depends upon previous
-    // COM activity in this test process, so allow both types here.
-    EXPECT_TRUE(apt_type == APTTYPE_MAINSTA || apt_type == APTTYPE_STA);
-  } else {
-    EXPECT_EQ(E_NOTIMPL, hresult);
-  }
+  EXPECT_EQ(S_OK, hresult);
+  // Whether the thread is the "main" STA apartment depends upon previous
+  // COM activity in this test process, so allow both types here.
+  EXPECT_TRUE(apt_type == APTTYPE_MAINSTA || apt_type == APTTYPE_STA);
 }
 #endif // defined(OS_WIN)
 
 }  // namespace remoting