Add Redirection For BrowserThread::FILE to the COM STA Task Runner

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 1031 matching lines @@
         if (redirect_thread) {
           non_ui_non_io_task_runner_traits = kUserBlockingTraits;
         } else {
           thread_to_start = &file_user_blocking_thread_;
         }
         break;
       case BrowserThread::FILE:
         TRACE_EVENT_BEGIN1("startup",
             "BrowserMainLoop::CreateThreads:start",
             "Thread", "BrowserThread::FILE");
-
-#if defined(OS_WIN)
-        // On Windows, the FILE thread needs to have a UI message loop which
-        // pumps messages in such a way that Google Update can communicate back
-        // to us.
-        // TODO(robliao): Need to support COM in TaskScheduler before
-        // redirecting the FILE thread on Windows. http://crbug.com/662122
-        thread_to_start = &file_thread_;
-        options = ui_message_loop_options;
-        options.timer_slack = base::TIMER_SLACK_MAXIMUM;
-#else
         if (redirect_thread) {
           non_ui_non_io_task_runner_traits = kUserVisibleTraits;
         } else {
           thread_to_start = &file_thread_;
           options = io_message_loop_options;
           options.timer_slack = base::TIMER_SLACK_MAXIMUM;
         }
-#endif
         break;
       case BrowserThread::PROCESS_LAUNCHER:
         TRACE_EVENT_BEGIN1("startup",
             "BrowserMainLoop::CreateThreads:start",
             "Thread", "BrowserThread::PROCESS_LAUNCHER");
 #if defined(OS_ANDROID)
         // Android specializes Launcher thread so it is accessible in java.
         // Note Android never does clean shutdown, so shutdown use-after-free
         // concerns are not a problem in practice.
         redirect_thread = false;
@@ skipping 50 matching lines @@
     BrowserThread::ID id = static_cast<BrowserThread::ID>(thread_id);
 
     if (thread_to_start) {
       (*thread_to_start)
           .reset(message_loop ? new BrowserProcessSubThread(id, message_loop)
                               : new BrowserProcessSubThread(id));
       // Start the thread if an existing |message_loop| wasn't provided.
       if (!message_loop && !(*thread_to_start)->StartWithOptions(options))
         LOG(FATAL) << "Failed to start the browser thread: id == " << id;
     } else {
-      scoped_refptr<base::SingleThreadTaskRunner> redirection_task_runner =
-          base::CreateSingleThreadTaskRunnerWithTraits(
-              non_ui_non_io_task_runner_traits);
+      scoped_refptr<base::SingleThreadTaskRunner> redirection_task_runner;
+#if defined(OS_WIN)
+      // On Windows, the FILE thread needs to have a UI message loop which
+      // pumps messages in such a way that Google Update can communicate back
+      // to us. The COM STA task runner provides this service.
+      redirection_task_runner =
+          (thread_id == BrowserThread::FILE)
+              ? base::CreateCOMSTATaskRunnerWithTraits(
+                    non_ui_non_io_task_runner_traits)
+              : base::CreateSingleThreadTaskRunnerWithTraits(
+                    non_ui_non_io_task_runner_traits);
+#else   // defined(OS_WIN)
+      redirection_task_runner = base::CreateSingleThreadTaskRunnerWithTraits(
+          non_ui_non_io_task_runner_traits);
+#endif  // defined(OS_WIN)
       DCHECK(redirection_task_runner);
       BrowserThreadImpl::RedirectThreadIDToTaskRunner(
           id, std::move(redirection_task_runner));
     }
 
     TRACE_EVENT_END0("startup", "BrowserMainLoop::CreateThreads:start");
   }
   created_threads_ = true;
   return result_code_;
 }
@@ skipping 617 matching lines @@
         BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 
   audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
   CHECK(audio_system_);
 }
 
 }  // namespace content