Tether: Persist if first-time setup is required to HostScanCache.

chromeos/components/tether/host_scan_cache.h

 // Copyright 2017 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 CHROMEOS_COMPONENTS_TETHER_HOST_SCAN_CACHE_H_
 #define CHROMEOS_COMPONENTS_TETHER_HOST_SCAN_CACHE_H_
 
 #include <memory>
 #include <unordered_map>
 
@@ skipping 39 matching lines @@
   // Updates the cache to include this scan result. If no scan result for
   // |tether_network_guid| exists in the cache, a scan result will be added;
   // if a scan result is already present, it is updated with the new data
   // provided as parameters to this function. Once scan results have been
   // updated, a timer starts counting down |kNumMinutesBeforeCacheEntryExpires|
   // minutes. Once the timer fires, the scan result is automatically removed
   // from the cache unless it corresponds to the active host.
   // Note: |signal_strength| should be in the range [0, 100]. This is different
   // from the |connection_strength| field received in ConnectTetheringResponse
   // and KeepAliveTickleResponse messages (the range is [0, 4] in those cases).
+  // |battery_percentage| should also be in the range [0, 100].
+  // |setup_required| indicates that the host device requires first-time setup,
+  // i.e. user interaction to allow tethering.

[Kyle Horimoto, 2017/05/31 23:01:19]

supernit: "i.e.," (comma after)

Same below.

[Ryan Hansberry, 2017/06/01 01:07:51]

Done.

   virtual void SetHostScanResult(const std::string& tether_network_guid,
                                  const std::string& device_name,
                                  const std::string& carrier,
                                  int battery_percentage,
-                                 int signal_strength);
+                                 int signal_strength,
+                                 bool setup_required);
 
   // Removes the scan result with GUID |tether_network_guid| from the cache. If
   // no cache result with that GUID was present in the cache, this function is
   // a no-op. Returns whether a scan result was actually removed.
   virtual bool RemoveHostScanResult(const std::string& tether_network_guid);
 
   // Removes all scan results from the cache unless they correspond to the
   // active host; the active host must always remain in the cache while
   // connecting/connected to ensure the UI is up to date.
   virtual void ClearCacheExceptForActiveHost();
 
+  // Returns true if the host device requires first-time setup, i.e. user
+  // interaction to allow tethering.
+  virtual bool DoesHostRequireSetup(const std::string& tether_network_guid);
+
   // TetherHostResponseRecorder::Observer:
   void OnPreviouslyConnectedHostIdsChanged() override;
 
   class TimerFactory {
    public:
     virtual std::unique_ptr<base::Timer> CreateOneShotTimer() = 0;
   };
 
  private:
   friend class HostScanCacheTest;
@@ skipping 10 matching lines @@
   ActiveHost* active_host_;
   TetherHostResponseRecorder* tether_host_response_recorder_;
   DeviceIdTetherNetworkGuidMap* device_id_tether_network_guid_map_;
 
   // Maps from the Tether network GUID to a Timer object. While a scan result is
   // active in the cache, the corresponding Timer object starts running; if the
   // timer fires, the result is removed (unless it corresponds to the active
   // host).
   std::unordered_map<std::string, std::unique_ptr<base::Timer>>
       tether_guid_to_timer_map_;
+  std::unordered_set<std::string> setup_required_tether_guids_;
   base::WeakPtrFactory<HostScanCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HostScanCache);
 };
 
 }  // namespace tether
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_COMPONENTS_TETHER_HOST_SCAN_CACHE_H_