chromeos: Use scoped_ptr for CrosDBusService.

chrome/browser/chromeos/dbus/dbus_thread_manager.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 CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
@@ skipping 21 matching lines @@
 //
 // This class also manages D-Bus connections and D-Bus clients, which
 // depend on the D-Bus thread to ensure the right order of shutdowns for
 // the D-Bus thread, the D-Bus connections, and the D-Bus clients.
 //
 // CALLBACKS IN D-BUS CLIENTS:
 //
 // D-Bus clients managed by DBusThreadManager are guaranteed to be deleted
 // after the D-Bus thread so the clients don't need to worry if new
 // incoming messages arrive from the D-Bus thread during shutdown of the
-// clients. However, the UI message loop may still be running during the
-// shutdown, hence the D-Bus clients should inherit
-// base::RefCountedThreadSafe if they export methods or call methods, to
-// ensure that callbacks can reference |this| safely on the UI thread
-// during the shutdown.
+// clients. The UI message loop is not running during the shutdown hence
+// the UI message loop won't post tasks to D-BUS clients during the
+// shutdown. However, to be extra cautious, clients should use
+// WeakPtrFactory when creating callbacks that run on UI thread. See
+// session_manager_client.cc for examples.
 //
 class DBusThreadManager {
  public:
   // Sets the global instance. Must be called before any calls to Get().
   // We explicitly initialize and shut down the global object, rather than
   // making it a Singleton, to ensure clean startup and shutdown.
   static void Initialize();
 
   // Destroys the global instance.
   static void Shutdown();
@@ skipping 39 matching lines @@
   SpeechSynthesizerClient* speech_synthesizer_client() {
     return speech_synthesizer_client_.get();
   }
 
  private:
   DBusThreadManager();
   virtual ~DBusThreadManager();
 
   scoped_ptr<base::Thread> dbus_thread_;
   scoped_refptr<dbus::Bus> system_bus_;
-  CrosDBusService* cros_dbus_service_;
+  scoped_ptr<CrosDBusService> cros_dbus_service_;
   scoped_ptr<SensorsSource> sensors_source_;
   scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_;
   scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_