device/bluetooth: Move GATT observer methods to BluetoothAdapter::Observer.

chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc

 // Copyright 2014 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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
 #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 273 matching lines @@
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetService) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(3)
       .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(2)
       .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
       .WillOnce(Return(service0_.get()));
 
   // Load and wait for setup.
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_service")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ServiceEvents) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   // Load the extension and let it set up.
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/service_events")));
 
-  // Cause events to be sent to the extension.
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-
   // These will create the identifier mappings.
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service1_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service1_.get());
 
   // These will send the onServiceAdded event to apps.
-  event_router()->GattDiscoveryCompleteForService(service0_.get());
-  event_router()->GattDiscoveryCompleteForService(service1_.get());
+  event_router()->GattDiscoveryCompleteForService(mock_adapter_,
+                                                  service0_.get());
+  event_router()->GattDiscoveryCompleteForService(mock_adapter_,
+                                                  service1_.get());
 
   // This will send the onServiceChanged event to apps.
-  event_router()->GattServiceChanged(service1_.get());
+  event_router()->GattServiceChanged(mock_adapter_, service1_.get());
 
   // This will send the  onServiceRemoved event to apps.
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattServiceRemoved(device0_.get(), service1_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service1_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedService) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   // Load the extension and let it set up.
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_removed_service")));
 
   // 1. getService success.
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(1)
       .WillOnce(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(1)
       .WillOnce(Return(service0_.get()));
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattDiscoveryCompleteForService(service0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattDiscoveryCompleteForService(mock_adapter_,
+                                                  service0_.get());
 
   ExtensionTestMessageListener get_service_success_listener("getServiceSuccess",
                                                             true);
   EXPECT_TRUE(get_service_success_listener.WaitUntilSatisfied());
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
   testing::Mock::VerifyAndClearExpectations(device0_.get());
 
   // 2. getService fail.
   EXPECT_CALL(*mock_adapter_, GetDevice(_)).Times(0);
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0)).Times(0);
 
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 
   ExtensionTestMessageListener get_service_fail_listener("getServiceFail",
                                                          true);
   EXPECT_TRUE(get_service_fail_listener.WaitUntilSatisfied());
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
   testing::Mock::VerifyAndClearExpectations(device0_.get());
 
   get_service_fail_listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetIncludedServices) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/get_included_services")));
 
   // Wait for initial call to end with failure as there is no mapping.
   ExtensionTestMessageListener listener("ready", true);
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   // Set up for the rest of the calls before replying. Included services can be
   // returned even if there is no instance ID mapping for them yet, so no need
   // to call GattServiceAdded for |service1_| here.
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
 
   std::vector<BluetoothGattService*> includes;
   includes.push_back(service1_.get());
   EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress0))
       .Times(2)
       .WillRepeatedly(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(2)
       .WillRepeatedly(Return(service0_.get()));
   EXPECT_CALL(*service0_, GetIncludedServices())
       .Times(2)
       .WillOnce(Return(std::vector<BluetoothGattService*>()))
       .WillOnce(Return(includes));
 
   listener.Reply("go");
   listener.Reset();
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetCharacteristics) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   std::vector<BluetoothGattCharacteristic*> characteristics;
   characteristics.push_back(chrc0_.get());
   characteristics.push_back(chrc1_.get());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_)).Times(3).WillRepeatedly(
       Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(3)
       .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
       .WillRepeatedly(Return(service0_.get()));
   EXPECT_CALL(*service0_, GetCharacteristics())
       .Times(2)
       .WillOnce(Return(std::vector<BluetoothGattCharacteristic*>()))
       .WillOnce(Return(characteristics));
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_characteristics")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetCharacteristic) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(4)
       .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(3)
       .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
       .WillRepeatedly(Return(service0_.get()));
 
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
       .Times(2)
       .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(NULL)))
       .WillOnce(Return(chrc0_.get()));
 
   // Load the extension and wait for first test.
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_characteristic")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, CharacteristicProperties) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(12)
       .WillRepeatedly(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(12)
       .WillRepeatedly(Return(service0_.get()));
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
       .Times(12)
       .WillRepeatedly(Return(chrc0_.get()));
@@ skipping 28 matching lines @@
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/characteristic_properties")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedCharacteristic) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(1)
       .WillOnce(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(1)
       .WillOnce(Return(service0_.get()));
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
       .Times(1)
       .WillOnce(Return(chrc0_.get()));
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/get_removed_characteristic")));
 
   ExtensionTestMessageListener listener("ready", true);
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
   testing::Mock::VerifyAndClearExpectations(device0_.get());
   testing::Mock::VerifyAndClearExpectations(service0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_)).Times(0);
   EXPECT_CALL(*device0_, GetGattService(_)).Times(0);
   EXPECT_CALL(*service0_, GetCharacteristic(_)).Times(0);
 
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
 
   listener.Reply("go");
   listener.Reset();
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, CharacteristicValueChanged) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   // Cause events to be sent to the extension.
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service1_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattCharacteristicAdded(service1_.get(), chrc2_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service1_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc2_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(2)
       .WillRepeatedly(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(1)
       .WillOnce(Return(service0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId1))
       .Times(1)
       .WillOnce(Return(service1_.get()));
@@ skipping 23 matching lines @@
               session1));
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/characteristic_value_changed")));
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   std::vector<uint8> value;
   event_router()->GattCharacteristicValueChanged(
-      service0_.get(), chrc0_.get(), value);
+      mock_adapter_, chrc0_.get(), value);
   event_router()->GattCharacteristicValueChanged(
-      service1_.get(), chrc2_.get(), value);
+      mock_adapter_, chrc2_.get(), value);
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattCharacteristicRemoved(service1_.get(), chrc2_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service1_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc2_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service1_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ReadCharacteristicValue) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(3)
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(3)
       .WillRepeatedly(Return(service0_.get()));
 
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
       .Times(3)
       .WillRepeatedly(Return(chrc0_.get()));
 
   std::vector<uint8> value;
   EXPECT_CALL(*chrc0_, ReadRemoteCharacteristic(_, _))
       .Times(2)
       .WillOnce(InvokeCallbackArgument<1>())
       .WillOnce(InvokeCallbackArgument<0>(value));
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/read_characteristic_value")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, WriteCharacteristicValue) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(3)
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(3)
       .WillRepeatedly(Return(service0_.get()));
 
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
@@ skipping 10 matching lines @@
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/write_characteristic_value")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetDescriptors) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   std::vector<BluetoothGattDescriptor*> descriptors;
   descriptors.push_back(desc0_.get());
   descriptors.push_back(desc1_.get());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(3)
       .WillRepeatedly(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(3)
       .WillRepeatedly(Return(service0_.get()));
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
       .Times(3)
       .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(NULL)))
       .WillRepeatedly(Return(chrc0_.get()));
   EXPECT_CALL(*chrc0_, GetDescriptors())
       .Times(2)
       .WillOnce(Return(std::vector<BluetoothGattDescriptor*>()))
       .WillOnce(Return(descriptors));
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_descriptors")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetDescriptor) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(5)
       .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(4)
       .WillOnce(Return(static_cast<BluetoothGattService*>(NULL)))
       .WillRepeatedly(Return(service0_.get()));
@@ skipping 11 matching lines @@
   // Load the extension and wait for first test.
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_descriptor")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc0_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedDescriptor) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(1)
       .WillOnce(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(1)
       .WillOnce(Return(service0_.get()));
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
       .Times(1)
       .WillOnce(Return(chrc0_.get()));
   EXPECT_CALL(*chrc0_, GetDescriptor(kTestDescriptorId0))
       .Times(1)
       .WillOnce(Return(desc0_.get()));
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/get_removed_descriptor")));
 
   ExtensionTestMessageListener listener("ready", true);
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
   testing::Mock::VerifyAndClearExpectations(device0_.get());
   testing::Mock::VerifyAndClearExpectations(service0_.get());
   testing::Mock::VerifyAndClearExpectations(chrc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_)).Times(0);
   EXPECT_CALL(*device0_, GetGattService(_)).Times(0);
   EXPECT_CALL(*service0_, GetCharacteristic(_)).Times(0);
   EXPECT_CALL(*chrc0_, GetDescriptor(_)).Times(0);
 
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc0_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
 
   listener.Reply("go");
   listener.Reset();
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, DescriptorValueChanged) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc1_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc1_.get());
 
   // Load the extension and let it set up.
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/descriptor_value_changed")));
 
   // Cause events to be sent to the extension.
   std::vector<uint8> value;
-  event_router()->GattDescriptorValueChanged(chrc0_.get(), desc0_.get(), value);
-  event_router()->GattDescriptorValueChanged(chrc0_.get(), desc1_.get(), value);
+  event_router()->GattDescriptorValueChanged(
+      mock_adapter_, desc0_.get(), value);
+  event_router()->GattDescriptorValueChanged(
+      mock_adapter_, desc1_.get(), value);
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc1_.get());
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc0_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc1_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ReadDescriptorValue) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(3)
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(3)
       .WillRepeatedly(Return(service0_.get()));
 
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
@@ skipping 12 matching lines @@
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/read_descriptor_value")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc0_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, WriteDescriptorValue) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .Times(3)
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .Times(3)
       .WillRepeatedly(Return(service0_.get()));
 
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
@@ skipping 14 matching lines @@
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/write_descriptor_value")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc0_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, PermissionDenied) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/permission_denied")));
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, UuidPermissionMethods) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get());
 
   std::vector<BluetoothGattService*> services;
   services.push_back(service0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .WillRepeatedly(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattServices()).WillOnce(Return(services));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .WillRepeatedly(Return(service0_.get()));
   EXPECT_CALL(*service0_, GetCharacteristic(kTestCharacteristicId0))
       .WillRepeatedly(Return(chrc0_.get()));
   EXPECT_CALL(*chrc0_, GetDescriptor(kTestDescriptorId0))
       .WillRepeatedly(Return(desc0_.get()));
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/uuid_permission_methods")));
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc0_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, UuidPermissionEvents) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/uuid_permission_events")));
 
   // Cause events to be sent to the extension.
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattDescriptorAdded(chrc0_.get(), desc0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get());
 
   std::vector<uint8> value;
   event_router()->GattCharacteristicValueChanged(
-      service0_.get(), chrc0_.get(), value);
-  event_router()->GattDescriptorValueChanged(chrc0_.get(), desc0_.get(), value);
-  event_router()->GattServiceChanged(service0_.get());
+      mock_adapter_, chrc0_.get(), value);
+  event_router()->GattDescriptorValueChanged(
+      mock_adapter_, desc0_.get(), value);
+  event_router()->GattServiceChanged(mock_adapter_, service0_.get());
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   listener.Reply("go");
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->GattDescriptorRemoved(chrc0_.get(), desc0_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GattConnection) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->DeviceAdded(mock_adapter_, device1_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .WillRepeatedly(Return(static_cast<BluetoothDevice*>(NULL)));
   EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress0))
       .WillRepeatedly(Return(device0_.get()));
   EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress1))
       .WillRepeatedly(Return(device1_.get()));
   EXPECT_CALL(*device0_, CreateGattConnection(_, _))
       .Times(3)
       .WillOnce(InvokeCallbackArgument<1>(BluetoothDevice::ERROR_FAILED))
       .WillOnce(InvokeCallbackWithScopedPtrArg<0, BluetoothGattConnection>(
           CreateGattConnection(kTestLeDeviceAddress0,
                                true /* expect_disconnect */)))
       .WillOnce(InvokeCallbackWithScopedPtrArg<0, BluetoothGattConnection>(
           CreateGattConnection(kTestLeDeviceAddress0,
                                false /* expect_disconnect */)));
   EXPECT_CALL(*device1_, CreateGattConnection(_, _))
       .Times(1)
       .WillOnce(InvokeCallbackWithScopedPtrArg<0, BluetoothGattConnection>(
           CreateGattConnection(kTestLeDeviceAddress1,
                                true /* expect_disconnect */)));
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/gatt_connection")));
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-
-  event_router()->DeviceRemoved(mock_adapter_, device1_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ReconnectAfterDisconnected) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress0))
       .WillRepeatedly(Return(device0_.get()));
 
   MockBluetoothGattConnection* first_conn =
       static_cast<MockBluetoothGattConnection*>(CreateGattConnection(
           kTestLeDeviceAddress0, false /* expect_disconnect */));
   EXPECT_CALL(*first_conn, IsConnected())
       .Times(2)
       .WillOnce(Return(true))
       .WillOnce(Return(false));
 
   EXPECT_CALL(*device0_, CreateGattConnection(_, _))
       .Times(2)
       .WillOnce(InvokeCallbackWithScopedPtrArg<0, BluetoothGattConnection>(
           first_conn))
       .WillOnce(InvokeCallbackWithScopedPtrArg<0, BluetoothGattConnection>(
           CreateGattConnection(kTestLeDeviceAddress0,
                                false /* expect_disconnect */)));
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/reconnect_after_disconnected")));
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ConnectInProgress) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress0))
       .WillRepeatedly(Return(device0_.get()));
 
   BluetoothDevice::GattConnectionCallback connect_callback;
   base::Closure disconnect_callback;
 
   testing::NiceMock<MockBluetoothGattConnection>* conn =
       new testing::NiceMock<MockBluetoothGattConnection>(
           kTestLeDeviceAddress0);
@@ skipping 12 matching lines @@
 
   listener.WaitUntilSatisfied();
   connect_callback.Run(conn_ptr.Pass());
 
   listener.Reset();
   listener.WaitUntilSatisfied();
   disconnect_callback.Run();
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, StartStopNotifications) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
-  event_router()->DeviceAdded(mock_adapter_, device0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service0_.get());
-  event_router()->GattServiceAdded(device0_.get(), service1_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc0_.get());
-  event_router()->GattCharacteristicAdded(service0_.get(), chrc1_.get());
-  event_router()->GattCharacteristicAdded(service1_.get(), chrc2_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service0_.get());
+  event_router()->GattServiceAdded(
+      mock_adapter_, device0_.get(), service1_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc1_.get());
+  event_router()->GattCharacteristicAdded(mock_adapter_, chrc2_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(_))
       .WillRepeatedly(Return(device0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId0))
       .WillRepeatedly(Return(service0_.get()));
   EXPECT_CALL(*device0_, GetGattService(kTestServiceId1))
       .WillRepeatedly(Return(service1_.get()));
   EXPECT_CALL(*service1_, GetCharacteristic(kTestCharacteristicId2))
       .Times(1)
       .WillOnce(Return(chrc2_.get()));
@@ skipping 28 matching lines @@
               session1));
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/start_stop_notifications")));
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   std::vector<uint8> value;
   event_router()->GattCharacteristicValueChanged(
-      service0_.get(), chrc0_.get(), value);
+      mock_adapter_, chrc0_.get(), value);
   event_router()->GattCharacteristicValueChanged(
-      service0_.get(), chrc1_.get(), value);
+      mock_adapter_, chrc1_.get(), value);
   event_router()->GattCharacteristicValueChanged(
-      service1_.get(), chrc2_.get(), value);
+      mock_adapter_, chrc2_.get(), value);
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->GattCharacteristicRemoved(service1_.get(), chrc2_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc1_.get());
-  event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service1_.get());
-  event_router()->GattServiceRemoved(device0_.get(), service0_.get());
-  event_router()->DeviceRemoved(mock_adapter_, device0_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc2_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc1_.get());
+  event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service1_.get());
+  event_router()->GattServiceRemoved(
+      mock_adapter_, device0_.get(), service0_.get());
 }
 
 }  // namespace