Make BluetoothAdapterBlueZ::Init early out if shutdown

device/bluetooth/bluez/bluetooth_adapter_bluez.cc

 // Copyright 2013 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/bluetooth/bluez/bluetooth_adapter_bluez.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 190 matching lines @@
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&BluetoothAdapterBlueZ::Init,
                               weak_ptr_factory_.GetWeakPtr()));
     return;
   }
   bluez::BluezDBusManager::Get()->CallWhenObjectManagerSupportIsKnown(
       base::Bind(&BluetoothAdapterBlueZ::Init, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void BluetoothAdapterBlueZ::Init() {
+  // We've been shutdown before Init() was run. Do nothing.
+  if (dbus_is_shutdown_)

[sky, 2016/08/25 17:15:09]

I don't know if we need to set initialized_ and run init_callback_ as happens on
218/219 in this case. One option is to combine the conditionals, by that I mean
move this into 217. I'm not familiar enough with the code to know which is
preferable.

[Rahul Chaturvedi, 2016/08/25 20:21:59]

In case a test is waiting on the adapter to get ready (which plenty do), they'd
time out. Even if they were to fail, we'd rather they fail than time out. So
this should be moved down to 217,
if (dbus_is_shutdown_ ||
!bluez::BluezDBusManager::Get()->IsObjectManagerSupported()) {

[sky, 2016/08/25 20:27:27]

Done.

+    return;
+
   // If the platform doesn't support Object Manager then Bluez 5 is probably
   // not present. In this case we just return without initializing anything.
   if (!bluez::BluezDBusManager::Get()->IsObjectManagerSupported()) {
     initialized_ = true;
     init_callback_.Run();
     return;
   }
 
   bluez::BluezDBusManager::Get()->GetBluetoothAdapterClient()->AddObserver(
       this);
@@ skipping 1464 matching lines @@
   } else if (error_name == bluetooth_adapter::kErrorAlreadyExists) {
     code = BluetoothServiceRecordBlueZ::ErrorCode::ERROR_RECORD_ALREADY_EXISTS;
   } else if (error_name == bluetooth_adapter::kErrorNotReady) {
     code = BluetoothServiceRecordBlueZ::ErrorCode::ERROR_ADAPTER_NOT_READY;
   }
 
   error_callback.Run(code);
 }
 
 }  // namespace bluez