Delayed adding BluetoothEventRouter as BluetoothAdapter observer until when the

device/bluetooth/bluetooth_adapter_chromeos.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/bluetooth/bluetooth_adapter_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 33 matching lines @@
       RemoveObserver(this);
   DBusThreadManager::Get()->GetBluetoothManagerClient()->
       RemoveObserver(this);
 
   STLDeleteValues(&devices_);
 }
 
 void BluetoothAdapterChromeOs::AddObserver(
     BluetoothAdapter::Observer* observer) {
   DCHECK(observer);
-  observers_.AddObserver(observer);
+  if (!observers_.HasObserver(observer))

[miket_OOO, 2012/11/06 02:04:09]

Aha. Would it make sense to move this check into GetMutableAdapter() and
preserve the expectation that a given observer can be added only once? One might
make the argument that it's the caller's job, not the AddObserver(), to make
sure not to add twice. It's not a huge deal, but it feels like an inconsistency.

[youngki, 2012/11/06 16:18:54]

Done. Reverted this file and this check is now done by bluetooth_event_router.

+    observers_.AddObserver(observer);
 }
 
 void BluetoothAdapterChromeOs::RemoveObserver(
     BluetoothAdapter::Observer* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 bool BluetoothAdapterChromeOs::IsPresent() const {
   return !object_path_.value().empty() && !address_.empty();
@@ skipping 465 matching lines @@
     DVLOG(1) << "Paired device " << device->address()
              << " is no longer visible to the adapter";
     device->SetVisible(false);
 
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceChanged(this, device));
   }
 }
 
 }  // namespace chromeos