Revert of Clear the BLE services list on disconnect.

content/browser/bluetooth/bluetooth_dispatcher_host.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 204 matching lines @@
   CacheQueryResult QueryCacheForDevice(const std::string& device_id);
   // Queries the platform cache for a Service with |service_instance_id|. Fills
   // in the |outcome| field, and |device| and |service| fields if successful.
   CacheQueryResult QueryCacheForService(const std::string& service_instance_id);
   // Queries the platform cache for a characteristic with
   // |characteristic_instance_id|. Fills in the |outcome| field, and |device|,
   // |service| and |characteristic| fields if successful.
   CacheQueryResult QueryCacheForCharacteristic(
       const std::string& characteristic_instance_id);
 
+  // Returns true if all services have been discovered for the device.
+  // When the host gets a ServiceChanged indication, it automatically
+  // re-discovers services, and only forwards the ServiceChanged event to this
+  // class when it's done re-discovering.
+  bool IsServicesDiscoveryCompleteForDevice(const std::string& device_id);
+
   // Adds the PrimaryServicesRequest to the vector of pending services requests
   // for that device.
   void AddToPendingPrimaryServicesRequest(
       const std::string& device_id,
       const PrimaryServicesRequest& request);
 
   // Show help pages from the chooser dialog.
   void ShowBluetoothOverviewLink();
   void ShowBluetoothPairingLink();
   void ShowBluetoothAdapterOffLink();
@@ skipping 34 matching lines @@
   // started. We have a single timer for all of Web Bluetooth because it's
   // simpler than tracking timeouts for each RequestDeviceSession individually,
   // and because there's no harm in extending the length of a few discovery
   // sessions when other sessions are active.
   base::Timer discovery_session_timer_;
 
   // Retain BluetoothGattConnection objects to keep connections open.
   // TODO(scheib): Destroy as connections are closed. http://crbug.com/539643
   ScopedVector<device::BluetoothGattConnection> connections_;
 
+  // Keeps track of which devices have had their services discovered.
+  std::set<std::string> devices_with_discovered_services_;
+
   // Map of device_id's to primary-services requests that need responses when
   // that device's service discovery completes.
   std::map<std::string, std::vector<PrimaryServicesRequest>>
       pending_primary_services_requests_;
 
   // |weak_ptr_on_ui_thread_| provides weak pointers, e.g. for callbacks, and
   // because it exists and has been bound to the UI thread enforces that all
   // copies verify they are also used on the UI thread.
   base::WeakPtr<BluetoothDispatcherHost> weak_ptr_on_ui_thread_;
   base::WeakPtrFactory<BluetoothDispatcherHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_