Bluetooth API: improve discovery

chrome/browser/extensions/api/bluetooth/bluetooth_api.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 "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
 
 #if defined(OS_CHROMEOS)
 #include <errno.h>
 #endif
 
@@ skipping 34 matching lines @@
 namespace {
 
 const char kCouldNotGetLocalOutOfBandPairingData[] =
     "Could not get local Out Of Band Pairing Data";
 const char kCouldNotSetOutOfBandPairingData[] =
     "Could not set Out Of Band Pairing Data";
 const char kFailedToConnect[] = "Connection failed";
 const char kInvalidDevice[] = "Invalid device";
 const char kServiceDiscoveryFailed[] = "Service discovery failed";
 const char kSocketNotFoundError[] = "Socket not found: invalid socket id";
-const char kStartDiscoveryFailed[] =
-    "Starting discovery failed, or already discovering";
+const char kStartDiscoveryFailed[] = "Starting discovery failed";
 const char kStopDiscoveryFailed[] = "Failed to stop discovery";
 
 }  // namespace
 
 namespace Connect = extensions::api::experimental_bluetooth::Connect;
 namespace Disconnect = extensions::api::experimental_bluetooth::Disconnect;
 namespace GetDevices = extensions::api::experimental_bluetooth::GetDevices;
 namespace GetServices = extensions::api::experimental_bluetooth::GetServices;
 namespace Read = extensions::api::experimental_bluetooth::Read;
 namespace SetOutOfBandPairingData =
@@ skipping 371 matching lines @@
 bool BluetoothGetLocalOutOfBandPairingDataFunction::RunImpl() {
   GetMutableAdapter(profile())->ReadLocalOutOfBandPairingData(
       base::Bind(&BluetoothGetLocalOutOfBandPairingDataFunction::ReadCallback,
           this),
       base::Bind(&BluetoothGetLocalOutOfBandPairingDataFunction::ErrorCallback,
           this));
   return true;
 }
 
 void BluetoothStartDiscoveryFunction::OnSuccessCallback() {
+  GetEventRouter(profile())->SetResponsibleForDiscovery(true);
   SendResponse(true);
 }
 
 void BluetoothStartDiscoveryFunction::OnErrorCallback() {
   SetError(kStartDiscoveryFailed);
   SendResponse(false);
 }
 
 bool BluetoothStartDiscoveryFunction::RunImpl() {
   GetEventRouter(profile())->SetSendDiscoveryEvents(true);
 
-  // BluetoothAdapter will throw an error if we SetDiscovering(true) when
-  // discovery is already in progress
+  // If the adapter is already discovering, there is nothing else to do.
   if (GetMutableAdapter(profile())->IsDiscovering()) {
     SendResponse(true);
     return true;
   }
 
   GetMutableAdapter(profile())->SetDiscovering(true,
       base::Bind(&BluetoothStartDiscoveryFunction::OnSuccessCallback, this),
       base::Bind(&BluetoothStartDiscoveryFunction::OnErrorCallback, this));
   return true;
 }
 
 void BluetoothStopDiscoveryFunction::OnSuccessCallback() {
   SendResponse(true);
 }
 
 void BluetoothStopDiscoveryFunction::OnErrorCallback() {
   SetError(kStopDiscoveryFailed);
   SendResponse(false);
 }
 
 bool BluetoothStopDiscoveryFunction::RunImpl() {
   GetEventRouter(profile())->SetSendDiscoveryEvents(false);
-  GetMutableAdapter(profile())->SetDiscovering(false,
-      base::Bind(&BluetoothStopDiscoveryFunction::OnSuccessCallback, this),
-      base::Bind(&BluetoothStopDiscoveryFunction::OnErrorCallback, this));
+  if (GetEventRouter(profile())->IsResponsibleForDiscovery()) {
+    GetMutableAdapter(profile())->SetDiscovering(false,
+        base::Bind(&BluetoothStopDiscoveryFunction::OnSuccessCallback, this),
+        base::Bind(&BluetoothStopDiscoveryFunction::OnErrorCallback, this));
+  }
   return true;
 }
 
 #else
 
 // -----------------------------------------------------------------------------
 // NIY stubs
 // -----------------------------------------------------------------------------
 bool BluetoothIsAvailableFunction::RunImpl() {
   NOTREACHED() << "Not implemented yet";
@@ skipping 77 matching lines @@
 #endif
 
 BluetoothReadFunction::BluetoothReadFunction() {}
 BluetoothReadFunction::~BluetoothReadFunction() {}
 
 BluetoothWriteFunction::BluetoothWriteFunction() {}
 BluetoothWriteFunction::~BluetoothWriteFunction() {}
 
 }  // namespace api
 }  // namespace extensions