base::Bind: More random cleanups.

content/browser/mach_broker_mac.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MACH_BROKER_MAC_H_
 #define CONTENT_BROWSER_MACH_BROKER_MAC_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 68 matching lines @@
   static std::string GetMachPortName();
 
   // Implement |ProcessMetrics::PortProvider|.
   virtual mach_port_t TaskForPid(base::ProcessHandle process) const OVERRIDE;
 
   // Implement |content::NotificationObserver|.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
  private:
-  // Private constructor.
+  friend class MachBrokerTest;
+  friend struct DefaultSingletonTraits<MachBroker>;
+
   MachBroker();
   virtual ~MachBroker();
 
+  // Callback used to register notifications on the UI thread.
+  void RegisterNotifications();
+
   // True if the listener thread has been started.
   bool listener_thread_started_;
 
   // Used to register for notifications received by NotificationObserver.
   // Accessed only on the UI thread.
   content::NotificationRegistrar registrar_;
 
   // Stores mach info for every process in the broker.
   typedef std::map<base::ProcessHandle, MachInfo> MachMap;
   MachMap mach_map_;
 
   // Mutex that guards |mach_map_|.
   mutable base::Lock lock_;
 
-  friend class MachBrokerTest;
-  friend class RegisterNotificationTask;
-  // Needed in order to make the constructor private.
-  friend struct DefaultSingletonTraits<MachBroker>;
   DISALLOW_COPY_AND_ASSIGN(MachBroker);
 };
 
 #endif  // CONTENT_BROWSER_MACH_BROKER_MAC_H_