Short-circuit failures in BLE js tests

extensions/browser/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/extension_apitest.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_connection.h"
@@ skipping 259 matching lines @@
       .Times(3)
       .WillOnce(Return(static_cast<BluetoothDevice*>(NULL)))
       .WillRepeatedly(Return(device0_.get()));
 
   EXPECT_CALL(*device0_, GetGattServices())
       .Times(2)
       .WillOnce(Return(std::vector<BluetoothGattService*>()))
       .WillOnce(Return(services));
 
   // Load and wait for setup.
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_services")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();

[armansito, 2014/09/23 20:05:56]

Instead of doing this, you can give an ExtensionTestMessageListener an "error
message" to observe by calling set_failure_message() on the instance. This would
cause WaitUntilSatisfied to return false, and then in the tests you send the
error message for failure.

E.g.

  ExtensionTestMessageListener listener("ready", true);
  listener.set_failure_message("fail");
  ...
  EXPECT_TRUE(listener.WaitUntilSatisfied());

 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetService) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   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);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_service")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ServiceEvents) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   // Load the extension and let it set up.
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/service_events")));
 
   // These will create the identifier mappings.
   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(mock_adapter_,
                                                   service0_.get());
   event_router()->GattDiscoveryCompleteForService(mock_adapter_,
                                                   service1_.get());
 
   // This will send the onServiceChanged event to apps.
   event_router()->GattServiceChanged(mock_adapter_, service1_.get());
 
   // This will send the  onServiceRemoved event to apps.
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service1_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedService) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(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()->GattServiceAdded(
       mock_adapter_, device0_.get(), service0_.get());
   event_router()->GattDiscoveryCompleteForService(mock_adapter_,
                                                   service0_.get());
 
-  ExtensionTestMessageListener get_service_success_listener("getServiceSuccess",
-                                                            true);
+  ExtensionTestMessageListener get_service_success_listener(true);
   EXPECT_TRUE(get_service_success_listener.WaitUntilSatisfied());
+  ASSERT_EQ("getServiceSuccess", get_service_success_listener.message())
+      << get_service_success_listener.message();
   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(
       mock_adapter_, device0_.get(), service0_.get());
 
-  ExtensionTestMessageListener get_service_fail_listener("getServiceFail",
-                                                         true);
+  ExtensionTestMessageListener get_service_fail_listener(true);
   EXPECT_TRUE(get_service_fail_listener.WaitUntilSatisfied());
+  ASSERT_EQ("getServiceFail", get_service_fail_listener.message())
+      << get_service_fail_listener.message();
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
   testing::Mock::VerifyAndClearExpectations(device0_.get());
 
   get_service_fail_listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetIncludedServices) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(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);
+  ExtensionTestMessageListener listener(true);
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   // 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()->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());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetCharacteristics) {
   ResultCatcher catcher;
@@ skipping 46 matching lines @@
       .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);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_characteristic")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
@@ skipping 40 matching lines @@
           BluetoothGattCharacteristic::kPropertyIndicate |
           BluetoothGattCharacteristic::kPropertyAuthenticatedSignedWrites |
           BluetoothGattCharacteristic::kPropertyExtendedProperties |
           BluetoothGattCharacteristic::kPropertyReliableWrite |
           BluetoothGattCharacteristic::kPropertyWritableAuxiliaries));
 
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/characteristic_properties")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
@@ skipping 11 matching lines @@
       .Times(1)
       .WillOnce(Return(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);
+  ExtensionTestMessageListener listener(true);
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
   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(mock_adapter_, chrc0_.get());
 
   listener.Reply("go");
   listener.Reset();
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, CharacteristicValueChanged) {
   ResultCatcher catcher;
@@ skipping 83 matching lines @@
   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);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/read_characteristic_value")));
-  EXPECT_TRUE(listener.WaitUntilSatisfied());
+  listener.WaitUntilSatisfied();
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
@@ skipping 18 matching lines @@
       .WillRepeatedly(Return(chrc0_.get()));
 
   std::vector<uint8> write_value;
   EXPECT_CALL(*chrc0_, WriteRemoteCharacteristic(_, _, _))
       .Times(2)
       .WillOnce(InvokeCallbackArgument<2>())
       .WillOnce(DoAll(SaveArg<0>(&write_value), InvokeCallbackArgument<1>()));
 
   EXPECT_CALL(*chrc0_, GetValue()).Times(1).WillOnce(ReturnRef(write_value));
 
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/write_characteristic_value")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
@@ skipping 17 matching lines @@
       .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);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_descriptors")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
@@ skipping 20 matching lines @@
       .Times(3)
       .WillOnce(Return(static_cast<BluetoothGattCharacteristic*>(NULL)))
       .WillRepeatedly(Return(chrc0_.get()));
 
   EXPECT_CALL(*chrc0_, GetDescriptor(kTestDescriptorId0))
       .Times(2)
       .WillOnce(Return(static_cast<BluetoothGattDescriptor*>(NULL)))
       .WillOnce(Return(desc0_.get()));
 
   // Load the extension and wait for first test.
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bluetooth_low_energy/get_descriptor")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
@@ skipping 16 matching lines @@
       .WillOnce(Return(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);
+  ExtensionTestMessageListener listener(true);
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
   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(mock_adapter_, desc0_.get());
 
   listener.Reply("go");
   listener.Reset();
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, DescriptorValueChanged) {
@@ skipping 53 matching lines @@
   EXPECT_CALL(*chrc0_, GetDescriptor(kTestDescriptorId0))
       .Times(3)
       .WillRepeatedly(Return(desc0_.get()));
 
   std::vector<uint8> value;
   EXPECT_CALL(*desc0_, ReadRemoteDescriptor(_, _))
       .Times(2)
       .WillOnce(InvokeCallbackArgument<1>())
       .WillOnce(InvokeCallbackArgument<0>(value));
 
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/read_descriptor_value")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
@@ skipping 24 matching lines @@
       .WillRepeatedly(Return(desc0_.get()));
 
   std::vector<uint8> write_value;
   EXPECT_CALL(*desc0_, WriteRemoteDescriptor(_, _, _))
       .Times(2)
       .WillOnce(InvokeCallbackArgument<2>())
       .WillOnce(DoAll(SaveArg<0>(&write_value), InvokeCallbackArgument<1>()));
 
   EXPECT_CALL(*desc0_, GetValue()).Times(1).WillOnce(ReturnRef(write_value));
 
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/write_descriptor_value")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
@@ skipping 36 matching lines @@
   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.RestrictToBrowserContext(browser()->profile());
 
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/uuid_permission_events")));
 
   // Cause events to be sent to the extension.
   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(
       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();
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   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.RestrictToBrowserContext(browser()->profile());
@@ skipping 67 matching lines @@
           kTestLeDeviceAddress0);
   scoped_ptr<BluetoothGattConnection> conn_ptr(conn);
   EXPECT_CALL(*conn, Disconnect(_))
       .Times(1)
       .WillOnce(SaveArg<0>(&disconnect_callback));
 
   EXPECT_CALL(*device0_, CreateGattConnection(_, _))
       .Times(1)
       .WillOnce(SaveArg<0>(&connect_callback));
 
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/connect_in_progress")));
 
-  listener.WaitUntilSatisfied();
+  EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
   connect_callback.Run(conn_ptr.Pass());
 
   listener.Reset();
-  listener.WaitUntilSatisfied();
+  EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
   disconnect_callback.Run();
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, StartStopNotifications) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   event_router()->GattServiceAdded(
@@ skipping 36 matching lines @@
       .WillOnce(InvokeCallbackArgument<1>())
       .WillOnce(
           InvokeCallbackWithScopedPtrArg<0, BluetoothGattNotifySession>(
               session0));
   EXPECT_CALL(*chrc1_, StartNotifySession(_, _))
       .Times(1)
       .WillOnce(
           InvokeCallbackWithScopedPtrArg<0, BluetoothGattNotifySession>(
               session1));
 
-  ExtensionTestMessageListener listener("ready", true);
+  ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/start_stop_notifications")));
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
+  ASSERT_EQ("ready", listener.message()) << listener.message();
 
   std::vector<uint8> value;
   event_router()->GattCharacteristicValueChanged(
       mock_adapter_, chrc0_.get(), value);
   event_router()->GattCharacteristicValueChanged(
       mock_adapter_, chrc1_.get(), value);
   event_router()->GattCharacteristicValueChanged(
       mock_adapter_, chrc2_.get(), value);
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   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