Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1033)

Unified Diff: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

Issue 1353053002: Handle RESCAN events from the Bluetooth chooser by starting or extending a discovery session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Sync Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
diff --git a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
index cbc26aff1d2262f35f14a477fe66cbbff1214b45..ed27741c8ed65c300f2509115ed2d37be6dbfe8a 100644
--- a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
+++ b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
@@ -4,8 +4,12 @@
#include "content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/format_macros.h"
+#include "base/location.h"
#include "base/strings/stringprintf.h"
+#include "base/thread_task_runner_handle.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_discovery_session.h"
@@ -122,6 +126,8 @@ LayoutTestBluetoothAdapterProvider::GetBluetoothAdapter(
return GetFailingConnectionsAdapter();
else if (fake_adapter_name == "FailingGATTOperationsAdapter")
return GetFailingGATTOperationsAdapter();
+ else if (fake_adapter_name == "SecondDiscoveryFindsHeartRateAdapter")
+ return GetSecondDiscoveryFindsHeartRateAdapter();
else if (fake_adapter_name == "")
return NULL;
@@ -248,6 +254,40 @@ LayoutTestBluetoothAdapterProvider::GetGlucoseHeartRateAdapter() {
return adapter.Pass();
}
+// Adds a device to |adapter| and notifies all observers about that new device.
+// Mocks can call this asynchronously to cause changes in the middle of a test.
+static void AddDevice(scoped_refptr<NiceMockBluetoothAdapter> adapter,
+ scoped_ptr<NiceMockBluetoothDevice> new_device) {
+ NiceMockBluetoothDevice* new_device_ptr = new_device.get();
+ adapter->AddMockDevice(new_device.Pass());
+ FOR_EACH_OBSERVER(BluetoothAdapter::Observer, adapter->GetObservers(),
+ DeviceAdded(adapter.get(), new_device_ptr));
+}
+
+// static
+scoped_refptr<NiceMockBluetoothAdapter>
+LayoutTestBluetoothAdapterProvider::GetSecondDiscoveryFindsHeartRateAdapter() {
+ scoped_refptr<NiceMockBluetoothAdapter> adapter(GetPoweredAdapter());
+ NiceMockBluetoothAdapter* adapter_ptr = adapter.get();
+
+ EXPECT_CALL(*adapter, StartDiscoverySessionWithFilterRaw(_, _, _))
+ .WillOnce(RunCallbackWithResult<1 /* success_callback */>(
+ []() { return GetDiscoverySession(); }))
+ .WillOnce(
+ RunCallbackWithResult<1 /* success_callback */>([adapter_ptr]() {
+ // In the second discovery session, have the adapter discover a new
+ // device, shortly after the session starts.
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE,
+ base::Bind(&AddDevice, make_scoped_refptr(adapter_ptr),
+
+ base::Passed(GetHeartRateDevice(adapter_ptr))));
+ return GetDiscoverySession();
+ }));
+
+ return adapter;
+}
+
// static
scoped_refptr<NiceMockBluetoothAdapter>
LayoutTestBluetoothAdapterProvider::GetMissingServiceGenericAccessAdapter() {

Powered by Google App Engine
This is Rietveld 408576698