base::Bind: More random cleanups.

content/browser/mach_broker_mac.cc

 // Copyright (c) 2011 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/mach_broker_mac.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mach_ipc_mac.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/child_process_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 
 using content::BrowserThread;
 
 namespace {
 // Prints a string representation of a Mach error code.
 std::string MachErrorCode(kern_return_t err) {
   return base::StringPrintf("0x%x %s", err, mach_error_string(err));
 }
 }  // namespace
 
-// Required because notifications happen on the UI thread.
-class RegisterNotificationTask : public Task {
- public:
-  RegisterNotificationTask(
-      MachBroker* broker)
-      : broker_(broker) { }
-
-  virtual void Run() {
-    broker_->registrar_.Add(broker_,
-        content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-        content::NotificationService::AllBrowserContextsAndSources());
-    broker_->registrar_.Add(broker_,
-        content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-        content::NotificationService::AllBrowserContextsAndSources());
-    broker_->registrar_.Add(broker_,
-        content::NOTIFICATION_CHILD_PROCESS_CRASHED,
-        content::NotificationService::AllBrowserContextsAndSources());
-    broker_->registrar_.Add(broker_,
-        content::NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED,
-        content::NotificationService::AllBrowserContextsAndSources());
-  }
-
- private:
-  MachBroker* broker_;
-  DISALLOW_COPY_AND_ASSIGN(RegisterNotificationTask);
-};
-
 class MachListenerThreadDelegate : public base::PlatformThread::Delegate {
  public:
   MachListenerThreadDelegate(MachBroker* broker) : broker_(broker) {
     DCHECK(broker_);
     std::string port_name = MachBroker::GetMachPortName();
 
     // Create the receive port in the constructor, not in ThreadMain().  It is
     // important to create and register the receive port before starting the
     // thread so that child processes will always have someone who's listening.
     receive_port_.reset(new base::ReceivePort(port_name.c_str()));
@@ skipping 51 matching lines @@
   MachBroker* broker_;  // weak
 
   DISALLOW_COPY_AND_ASSIGN(MachListenerThreadDelegate);
 };
 
 // Returns the global MachBroker.
 MachBroker* MachBroker::GetInstance() {
   return Singleton<MachBroker, LeakySingletonTraits<MachBroker> >::get();
 }
 
-MachBroker::MachBroker() : listener_thread_started_(false) {
-}
-
-MachBroker::~MachBroker() {}
-
 void MachBroker::EnsureRunning() {
   lock_.AssertAcquired();
 
   if (!listener_thread_started_) {
     listener_thread_started_ = true;
 
     BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE, new RegisterNotificationTask(this));
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&MachBroker::RegisterNotifications, base::Unretained(this)));
 
     // Intentional leak.  This thread is never joined or reaped.
     base::PlatformThread::CreateNonJoinable(
         0, new MachListenerThreadDelegate(this));
   }
 }
 
 // Adds a placeholder to the map for the given pid with MACH_PORT_NULL.
 void MachBroker::AddPlaceholderForPid(base::ProcessHandle pid) {
   lock_.AssertAcquired();
@@ skipping 79 matching lines @@
 
 // static
 std::string MachBroker::GetMachPortName() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   const bool is_child = command_line->HasSwitch(switches::kProcessType);
 
   // In non-browser (child) processes, use the parent's pid.
   const pid_t pid = is_child ? getppid() : getpid();
   return base::StringPrintf("%s.rohitfork.%d", base::mac::BaseBundleID(), pid);
 }
+
+MachBroker::MachBroker() : listener_thread_started_(false) {
+}
+
+MachBroker::~MachBroker() {}
+
+void MachBroker::RegisterNotifications() {
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, content::NOTIFICATION_CHILD_PROCESS_CRASHED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, content::NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+}