bluetooth: Rename Is*Available to Is*Supported

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/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
 
 namespace device {
 
 namespace {
 
 // Shared default adapter instance.  We don't want to keep this class around
 // if nobody is using it, so use a WeakPtr and create the object when needed.
 // Since Google C++ Style (and clang's static analyzer) forbids us having
 // exit-time destructors, we use a leaky lazy instance for it.
 base::LazyInstance<base::WeakPtr<BluetoothAdapter>>::Leaky default_adapter =
@@ skipping 18 matching lines @@
        ++iter) {
     iter->Run(adapter);
   }
   adapter_callbacks.Get().clear();
 }
 #endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 
 }  // namespace
 
 // static
-bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() {
+bool BluetoothAdapterFactory::IsBluetoothSupported() {
   // 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) || \
     defined(OS_LINUX) || defined(OS_MACOSX)
   return true;
 #else
   return false;
 #endif
 }
 
 // static
-bool BluetoothAdapterFactory::IsLowEnergyAvailable() {
-  DCHECK(IsBluetoothAdapterAvailable());
-
+bool BluetoothAdapterFactory::IsLowEnergySupported() {
   // 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) || \
-    defined(OS_LINUX)
+
+#if defined(OS_ANDROID) && __ANDROID_API__ >= 23
   return true;
+#elif defined(OS_WIN)
+  return base::win::GetVersion() >= base::win::VERSION_WIN8;

[scheib, 2017/04/13 05:06:25]

Will we get in trouble with 8 level being supported for everything but
connection?

[ortuno, 2017/04/18 01:25:42]

And scanning! I kept the support at 8 to reflect our current support. When
Windows work starts ramping up we can decide if we want to keep supporting Win 8
and if so how to account for the missing features. This puts us at risk of
having to maintain the API on Win 8 if a new client expects it but the odds of
this are very low imo.

[scheib, 2017/04/18 03:38:41]

/shrug/ I would go with 10 now. But, your call.

[ortuno, 2017/04/18 07:05:34]

Increased to win 10 and added a note as to why we don't support win8.

 #elif defined(OS_MACOSX)
   return base::mac::IsAtLeastOS10_10();
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
+  return true;
 #else
   return false;
-#endif  // defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) ||
-        // defined(OS_LINUX)
+#endif
 }
 
 // static
 void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
-  DCHECK(IsBluetoothAdapterAvailable());
+  DCHECK(IsBluetoothSupported());
 
 #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());
   }
 
   if (!default_adapter.Get()->IsInitialized())
     adapter_callbacks.Get().push_back(callback);
@@ skipping 23 matching lines @@
     scoped_refptr<BluetoothAdapter> adapter) {
   default_adapter.Get() = adapter->GetWeakPtrForTesting();
 }
 
 // static
 bool BluetoothAdapterFactory::HasSharedInstanceForTesting() {
   return default_adapter.Get() != nullptr;
 }
 
 }  // namespace device