chromeos: Use scoped_ptr for CrosDBusService.

chrome/browser/chromeos/dbus/dbus_thread_manager.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 "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 
 #include "base/command_line.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
 #include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
@@ skipping 18 matching lines @@
 
   // Create the connection to the system bus.
   dbus::Bus::Options system_bus_options;
   system_bus_options.bus_type = dbus::Bus::SYSTEM;
   system_bus_options.connection_type = dbus::Bus::PRIVATE;
   system_bus_options.dbus_thread_message_loop_proxy =
       dbus_thread_->message_loop_proxy();
   system_bus_ = new dbus::Bus(system_bus_options);
 
   // Create and start the cros D-Bus service.
-  cros_dbus_service_ = CrosDBusService::Create(system_bus_.get());
+  cros_dbus_service_.reset(CrosDBusService::Create(system_bus_.get()));
   cros_dbus_service_->Start();
 
   // Start monitoring sensors if needed.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableSensors)) {
     sensors_source_.reset(new SensorsSource);
     sensors_source_->Init(system_bus_.get());
   }
 
   // Create bluetooth clients if bluetooth is enabled.
@@ skipping 14 matching lines @@
       SpeechSynthesizerClient::Create(system_bus_.get()));
 }
 
 DBusThreadManager::~DBusThreadManager() {
   // Shut down the bus. During the browser shutdown, it's ok to shut down
   // the bus synchronously.
   system_bus_->ShutdownOnDBusThreadAndBlock();
 
   // Stop the D-Bus thread.
   dbus_thread_->Stop();
-
-  // D-Bus clients should be deleted after the D-Bus thread is stopped.
-  // See "CALLBACKS IN D-BUS CLIENTS" in the header file for why.
-  delete cros_dbus_service_;
 }
 
 void DBusThreadManager::Initialize() {
   if (g_dbus_thread_manager) {
     // This can happen in tests.
     LOG(WARNING) << "DBusThreadManager::Initialize() was already called";
     return;
   }
   g_dbus_thread_manager = new DBusThreadManager;
   VLOG(1) << "DBusThreadManager initialized";
@@ skipping 15 matching lines @@
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 void DBusThreadManager::set_session_manager_client_for_testing(
     SessionManagerClient* session_manager_client) {
   session_manager_client_.reset(session_manager_client);
 }
 
 }  // namespace chromeos