Remove FILE thread dependency in protocol_handler_registry_unittest.cc

chrome/browser/custom_handlers/protocol_handler_registry.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/custom_handlers/protocol_handler_registry.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/child_process_security_policy.h"
@@ skipping 213 matching lines @@
     const std::string& protocol) {
 }
 
 bool ProtocolHandlerRegistry::Delegate::IsExternalHandlerRegistered(
     const std::string& protocol) {
   // NOTE(koz): This function is safe to call from any thread, despite living
   // in ProfileIOData.
   return ProfileIOData::IsHandledProtocol(protocol);
 }
 
-scoped_refptr<shell_integration::DefaultProtocolClientWorker>
-ProtocolHandlerRegistry::Delegate::CreateShellWorker(
-    const shell_integration::DefaultWebClientWorkerCallback& callback,
-    const std::string& protocol) {
-  return new shell_integration::DefaultProtocolClientWorker(callback, protocol);
-}
-
 void ProtocolHandlerRegistry::Delegate::RegisterWithOSAsDefaultClient(
     const std::string& protocol, ProtocolHandlerRegistry* registry) {
   // The worker pointer is reference counted. While it is running, the
-  // message loops of the FILE and UI thread will hold references to it
-  // and it will be automatically freed once all its tasks have finished.
-  CreateShellWorker(registry->GetDefaultWebClientCallback(protocol), protocol)
+  // sequence it runs on will hold references it will be automatically freed
+  // once all its tasks have finished.
+  base::MakeRefCounted<shell_integration::DefaultProtocolClientWorker>(
+      registry->GetDefaultWebClientCallback(protocol), protocol)
       ->StartSetAsDefault();
 }
 
 // ProtocolHandlerRegistry -----------------------------------------------------
 
 ProtocolHandlerRegistry::ProtocolHandlerRegistry(
     content::BrowserContext* context,
     Delegate* delegate)
     : context_(context),
       delegate_(delegate),
@@ skipping 134 matching lines @@
   IgnoreProtocolHandlersFromPref(prefs::kIgnoredProtocolHandlers, USER);
 
   is_loading_ = false;
 
   // For each default protocol handler, check that we are still registered
   // with the OS as the default application.
   if (ShouldRemoveHandlersNotInOS()) {
     for (ProtocolHandlerMap::const_iterator p = default_handlers_.begin();
          p != default_handlers_.end(); ++p) {
       ProtocolHandler handler = p->second;
-      // The worker pointer is reference counted. While it is running the
-      // message loops of the FILE and UI thread will hold references to it
-      // and it will be automatically freed once all its tasks have finished.
-      delegate_
-          ->CreateShellWorker(GetDefaultWebClientCallback(handler.protocol()),
-                              handler.protocol())
-          ->StartSetAsDefault();
+      delegate_->RegisterWithOSAsDefaultClient(handler.protocol(), this);
     }
   }
 }
 
 int ProtocolHandlerRegistry::GetHandlerIndex(const std::string& scheme) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   const ProtocolHandler& handler = GetHandlerFor(scheme);
   if (handler.IsEmpty())
     return -1;
   const ProtocolHandlerList* handlers = GetHandlerList(scheme);
@@ skipping 479 matching lines @@
 
 std::unique_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
 ProtocolHandlerRegistry::CreateJobInterceptorFactory() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // this is always created on the UI thread (in profile_io's
   // InitializeOnUIThread. Any method calls must be done
   // on the IO thread (this is checked).
   return std::unique_ptr<JobInterceptorFactory>(
       new JobInterceptorFactory(io_thread_delegate_.get()));
 }