Use SequencedTaskRunner where now possible after making Timer sequence-friendly.

chrome/browser/shell_integration.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 "chrome/browser/shell_integration.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 27 matching lines @@
 #endif
 
 using content::BrowserThread;
 
 namespace shell_integration {
 
 namespace {
 
 const struct AppModeInfo* gAppModeInfo = nullptr;
 
-scoped_refptr<base::SequencedTaskRunner>
-CreateTaskRunnerForDefaultWebClientWorker() {
-#if defined(OS_WIN)
-  if (base::win::GetVersion() >= base::win::VERSION_WIN10)
-    // TODO(pmonette): Windows 10's implementation uses a base::Timer which
-    // currently still requires a SingleThreadTaskRunner. Change this to a
-    // SequencedTaskRunner when crbug.com/552633 is fixed.
-    return base::CreateSingleThreadTaskRunnerWithTraits({base::MayBlock()});
-#endif  // defined(OS_WIN)
-  return base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()});
-}
-
 }  // namespace
 
 bool CanSetAsDefaultBrowser() {
   return GetDefaultWebClientSetPermission() != SET_DEFAULT_NOT_ALLOWED;
 }
 
 #if !defined(OS_WIN)
 bool IsElevationNeededForSettingDefaultProtocolClient() {
   return false;
 }
@@ skipping 117 matching lines @@
 DefaultWebClientWorker::GetTaskRunner() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // TODO(pmonette): The better way to make sure all instances of
   // DefaultWebClient share a SequencedTaskRunner is to make the worker a
   // singleton.
   static scoped_refptr<base::SequencedTaskRunner>* task_runner = nullptr;
 
   if (!task_runner) {
     task_runner = new scoped_refptr<base::SequencedTaskRunner>(
-        CreateTaskRunnerForDefaultWebClientWorker());
+        base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()}));
   }
 
   return *task_runner;
 }
 
 void DefaultWebClientWorker::CheckIsDefault(bool is_following_set_as_default) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   DefaultWebClientState state = CheckIsDefaultImpl();
   BrowserThread::PostTask(
@@ skipping 131 matching lines @@
             return;
         }
       }
 #endif  // defined(OS_WIN)
       break;
   }
   on_finished_callback.Run();
 }
 
 }  // namespace shell_integration