Revert of Disable COM Initialization on SchedulerWorkers When COM_INIT_CHECK_HOOK_ENABLED()

base/task_scheduler/scheduler_worker_unittest.cc

 // Copyright 2016 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/task_scheduler/scheduler_worker.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
@@ skipping 12 matching lines @@
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/simple_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <objbase.h>
-
-#include "base/win/com_init_check_hook.h"
 #endif
 
 using testing::_;
 using testing::Mock;
 using testing::Ne;
 using testing::StrictMock;
 
 namespace base {
 namespace internal {
 namespace {
@@ skipping 881 matching lines @@
   // until GetWork() returns.
   auto worker = make_scoped_refptr(new SchedulerWorker(
       ThreadPriority::NORMAL, std::move(delegate), &task_tracker, nullptr,
       SchedulerBackwardCompatibility::INIT_COM_STA));
   worker->Start();
   worker->WakeUp();
   delegate_raw->WaitUntilGetWorkReturned();
 
   // The call to CoInitializeEx() should have returned S_FALSE to indicate that
   // the COM library was already initialized on the thread.
-  // See SchedulerWorker::Thread::ThreadMain for why we expect two different
-  // results here.
-#if defined(COM_INIT_CHECK_HOOK_ENABLED)
-  EXPECT_EQ(S_OK, delegate_raw->coinitialize_hresult());
-#else
   EXPECT_EQ(S_FALSE, delegate_raw->coinitialize_hresult());
-#endif
 
   worker->JoinForTesting();
 }
 
 TEST(TaskSchedulerWorkerTest, BackwardCompatibilityDisabled) {
   TaskTracker task_tracker;
   auto delegate = MakeUnique<CoInitializeDelegate>();
   CoInitializeDelegate* const delegate_raw = delegate.get();
 
   // Create a worker with backward compatibility DISABLED. Wake it up and wait
   // until GetWork() returns.
   auto worker = make_scoped_refptr(new SchedulerWorker(
       ThreadPriority::NORMAL, std::move(delegate), &task_tracker, nullptr,
       SchedulerBackwardCompatibility::DISABLED));
   worker->Start();
   worker->WakeUp();
   delegate_raw->WaitUntilGetWorkReturned();
 
   // The call to CoInitializeEx() should have returned S_OK to indicate that the
   // COM library wasn't already initialized on the thread.
   EXPECT_EQ(S_OK, delegate_raw->coinitialize_hresult());
 
   worker->JoinForTesting();
 }
 
 #endif  // defined(OS_WIN)
 
 }  // namespace internal
 }  // namespace base