ChromeOS: Accept NULL SystemBus in MediaTransferProtocolManager.

device/media_transfer_protocol/media_transfer_protocol_manager.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 "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 #include <map>
 #include <queue>
 #include <set>
 #include <utility>
@@ skipping 32 matching lines @@
     DCHECK(!task_runner.get());
 #else
     DCHECK(task_runner.get());
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SYSTEM;
     options.connection_type = dbus::Bus::PRIVATE;
     options.dbus_task_runner = task_runner;
     session_bus_ = new dbus::Bus(options);
 #endif
 
-    // Listen for future mtpd service owner changes, in case it is not
-    // available right now. There is no guarantee on Linux or ChromeOS that
-    // mtpd is running already.
-    mtpd_owner_changed_callback_ =
-        base::Bind(&MediaTransferProtocolManagerImpl::FinishSetupOnOriginThread,
-                   weak_ptr_factory_.GetWeakPtr());
-    GetBus()->ListenForServiceOwnerChange(mtpd::kMtpdServiceName,
-                                          mtpd_owner_changed_callback_);
-    GetBus()->GetServiceOwner(mtpd::kMtpdServiceName,
-                              mtpd_owner_changed_callback_);
+    if (GetBus()) {
+      // Listen for future mtpd service owner changes, in case it is not
+      // available right now. There is no guarantee on Linux or ChromeOS that
+      // mtpd is running already.
+      mtpd_owner_changed_callback_ = base::Bind(
+          &MediaTransferProtocolManagerImpl::FinishSetupOnOriginThread,
+          weak_ptr_factory_.GetWeakPtr());
+      GetBus()->ListenForServiceOwnerChange(mtpd::kMtpdServiceName,
+                                            mtpd_owner_changed_callback_);
+      GetBus()->GetServiceOwner(mtpd::kMtpdServiceName,
+                                mtpd_owner_changed_callback_);
+    }
   }
 
   virtual ~MediaTransferProtocolManagerImpl() {
     DCHECK(g_media_transfer_protocol_manager);
     g_media_transfer_protocol_manager = NULL;
     GetBus()->UnlistenForServiceOwnerChange(mtpd::kMtpdServiceName,

[satorux1, 2013/11/05 03:41:18]

check GetBus() here too?

[pneubeck (no reviews), 2013/11/05 09:54:29]

Ops. Missed that. Good catch!

                                             mtpd_owner_changed_callback_);
 
 #if !defined(OS_CHROMEOS)
     session_bus_->GetDBusTaskRunner()->PostTask(
         FROM_HERE, base::Bind(&dbus::Bus::ShutdownAndBlock, session_bus_));
 #endif
 
     VLOG(1) << "MediaTransferProtocolManager Shutdown completed";
   }
 
@@ skipping 342 matching lines @@
       return;
 
     if (mtpd_service_owner.empty()) {
       current_mtpd_owner_.clear();
       mtp_client_.reset();
       return;
     }
 
     current_mtpd_owner_ = mtpd_service_owner;
 
-    mtp_client_.reset(
-        MediaTransferProtocolDaemonClient::Create(GetBus(),
-                                                  false /* not stub */));
+    mtp_client_.reset(MediaTransferProtocolDaemonClient::Create(GetBus()));
 
     // Set up signals and start initializing |storage_info_map_|.
     mtp_client_->SetUpConnections(
         base::Bind(&MediaTransferProtocolManagerImpl::OnStorageChanged,
                    weak_ptr_factory_.GetWeakPtr()));
     mtp_client_->EnumerateStorages(
         base::Bind(&MediaTransferProtocolManagerImpl::OnEnumerateStorages,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&base::DoNothing));
   }
@@ skipping 43 matching lines @@
   DCHECK(!g_media_transfer_protocol_manager);
 
   g_media_transfer_protocol_manager =
       new MediaTransferProtocolManagerImpl(task_runner);
   VLOG(1) << "MediaTransferProtocolManager initialized";
 
   return g_media_transfer_protocol_manager;
 }
 
 }  // namespace device