bluetoothLowEnergy: Send onServiceAdded after all characteristics are discovered

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 312 matching lines @@
   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());
+
+  // These will send the onServiceAdded event to apps.
+  event_router()->GattDiscoveryCompleteForService(service0_.get());
+  event_router()->GattDiscoveryCompleteForService(service1_.get());
+
+  // This will send the onServiceChanged event to apps.
   event_router()->GattServiceChanged(service1_.get());
+
+  // This will send the  onServiceRemoved event to apps.
   event_router()->GattServiceRemoved(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());
 }
 
 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());
 
   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);
@@ skipping 889 matching lines @@
   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());
 }
 
 }  // namespace