bluetooth: mac: Reject requestDevice promise if Mac version is <= 10.9

device/bluetooth/bluetooth_adapter_factory.cc

 // Copyright (c) 2012 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 "device/bluetooth/bluetooth_adapter_factory.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
+#include "base/mac/mac_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 
 namespace device {
 
 namespace {
 
 // Shared default adapter instance.  We don't want to keep this class around
@@ skipping 36 matching lines @@
     return true;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
     defined(OS_LINUX) || defined(OS_MACOSX)
   return true;
 #else
   return false;
 #endif
 }
 
 // static
+bool BluetoothAdapterFactory::IsLowEnergyAvailable() {
+  DCHECK(IsBluetoothAdapterAvailable());
+
+  // SetAdapterForTesting() may be used to provide a test or mock adapter
+  // instance even on platforms that would otherwise not support it.
+  if (default_adapter.Get())
+    return true;
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) || \

[ortuno, 2016/10/04 03:20:24]

We have a couple of issues to remove devices the user can't interact with from
the chooser. I think Windows falls under this category as well. WDYT?

[François Beaufort, 2016/10/04 10:00:22]

So you want Web Bluetooth chooser to not show up on Windows no matter what for
now?

[ortuno, 2016/10/04 21:23:16]

Now that I think about it the only way to use Web Bluetooth on Windows right now
is if you used the Web Bluetooth flag. So I think it's fine to leave as is for
now, we might want to revisit this once we ship on windows.

+    defined(OS_LINUX)
+  return true;
+#endif
+#if defined(OS_MACOSX)

[ortuno, 2016/10/04 03:20:24]

nit: Could you combine this with the previous line with #elif
defined(OS_MACOSX)?

[François Beaufort, 2016/10/04 10:00:22]

Done.

+  return base::mac::IsAtLeastOS10_10();
+#endif

[ortuno, 2016/10/04 03:20:24]

nit: comment missing:
// defined(OS_ANDROID) || defined(OS_CHROMEOS) ...

[François Beaufort, 2016/10/04 10:00:22]

Done.

+  return false;
+}
+
+// static
 void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
   DCHECK(IsBluetoothAdapterAvailable());
 
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
   if (!default_adapter.Get()) {
     default_adapter.Get() =
         BluetoothAdapter::CreateAdapter(base::Bind(&RunAdapterCallbacks));
     DCHECK(!default_adapter.Get()->IsInitialized());
   }
 
@@ skipping 25 matching lines @@
     scoped_refptr<BluetoothAdapter> adapter) {
   default_adapter.Get() = adapter->GetWeakPtrForTesting();
 }
 
 // static
 bool BluetoothAdapterFactory::HasSharedInstanceForTesting() {
   return default_adapter.Get() != nullptr;
 }
 
 }  // namespace device