Index: chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
index 0c5019180caf27e911974e7cb643a5511c9fbc3c..5746b70dcc842c5937d49203ff31f88271e26797 100644 |
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
@@ -315,7 +315,14 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, SetOutOfBandPairingData) { |
// crbug.com/132796 |
} |
-IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Discovery) { |
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
+// TODO(erg): linux_aura bringup: http://crbug.com/163931 |
+#define MAYBE_Discovery DISABLED_Discovery |
+#else |
+#define MAYBE_Discovery Discovery |
+#endif |
+ |
+IN_PROC_BROWSER_TEST_F(BluetoothApiTest, MAYBE_Discovery) { |
// Try with a failure to start |
EXPECT_CALL(*mock_adapter_, StartDiscovering(testing::_, testing::_)) |
.WillOnce(testing::Invoke(CallDiscoveryErrorCallback)); |