Convert path usage in NetworkListViewBase subclasses to use guids.

ash/common/system/chromeos/network/network_list.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 ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 19 matching lines @@
 // A list of available networks of a given type. This class is used for all
 // network types except VPNs. For VPNs, see the |VPNList| class.
 class NetworkListView : public NetworkListViewBase,
                         public network_icon::AnimationObserver {
  public:
   explicit NetworkListView(NetworkListDelegate* delegate);
   ~NetworkListView() override;
 
   // NetworkListViewBase:
   void Update() override;
-  bool IsNetworkEntry(views::View* view,
-                      std::string* service_path) const override;
+  bool IsNetworkEntry(views::View* view, std::string* guid) const override;
 
  private:
   void UpdateNetworks(
       const chromeos::NetworkStateHandler::NetworkStateList& networks);
   void UpdateNetworkIcons();
   void UpdateNetworkListInternal();
   void HandleRelayout();
-  bool UpdateNetworkListEntries(std::set<std::string>* new_service_paths);
-  bool UpdateNetworkChildren(std::set<std::string>* new_service_paths,
+  bool UpdateNetworkListEntries(std::set<std::string>* new_guids);
+  bool UpdateNetworkChildren(std::set<std::string>* new_guids,
                              int* child_index,
                              bool highlighted);
   bool UpdateNetworkChild(int index, const NetworkInfo* info);
   bool PlaceViewAtIndex(views::View* view, int index);
   bool UpdateInfoLabel(int message_id, int index, views::Label** label);
 
   // network_icon::AnimationObserver:
   void NetworkIconChanged() override;
 
   NetworkListDelegate* delegate_;
 
   views::Label* no_wifi_networks_view_;
   views::Label* no_cellular_networks_view_;
 
   // An owned list of network info.
   std::vector<std::unique_ptr<NetworkInfo>> network_list_;
 
   typedef std::map<views::View*, std::string> NetworkMap;
   NetworkMap network_map_;
 
-  // A map of network service paths to their view.
-  typedef std::map<std::string, views::View*> ServicePathMap;
-  ServicePathMap service_path_map_;
+  // A map of network guids to their view.
+  typedef std::map<std::string, views::View*> NetworkGuidMap;
+  NetworkGuidMap network_guid_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkListView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_