Add CheckPortalList manager property to NetworkStateHandler

chromeos/network/network_state_handler.h

Index: chromeos/network/network_state_handler.h
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h
index a361e2504950a5eac7e71c2b3f33f5f3c216e3c9..ca9136eef8cc5fadcf462afebd3460c256612c12 100644
--- a/chromeos/network/network_state_handler.h
+++ b/chromeos/network/network_state_handler.h
@@ -162,7 +162,11 @@ class CHROMEOS_EXPORT NetworkStateHandler
   // Set the user initiated connecting network.
   void SetConnectingNetwork(const std::string& service_path);
 
+  // Set the list of devices on which portal check is enabled.
+  void SetCheckPortalList(const std::string& check_portal_list);
+
   const std::string& connecting_network() const { return connecting_network_; }
+  const std::string& check_portal_list() const { return check_portal_list_; }
 
   // Generates a DictionaryValue of all NetworkState properties. Currently
   // provided for debugging purposes only.
@@ -177,6 +181,10 @@ class CHROMEOS_EXPORT NetworkStateHandler
   static const char kMatchTypeMobile[];
   static const char kMatchTypeNonVirtual[];
 
+  // Default set of comma separated interfaces on which to enable
+  // portal checking.
+  static const char kDefaultCheckPortalList[];
+
  protected:
   friend class NetworkHandler;
   NetworkStateHandler();
@@ -211,6 +219,11 @@ class CHROMEOS_EXPORT NetworkStateHandler
       const std::string& key,
       const base::Value& value) OVERRIDE;
 
+  // Called by ShillPropertyHandler when the portal check list manager property
+  // changes.
+  virtual void CheckPortalListChanged(
+      const std::string& check_portal_list) OVERRIDE;
+
   // Sends NetworkManagerChanged() to observers and logs an event.
   virtual void NotifyManagerPropertyChanged() OVERRIDE;
 
@@ -229,6 +242,7 @@ class CHROMEOS_EXPORT NetworkStateHandler
   typedef std::list<base::Closure> ScanCallbackList;
   typedef std::map<std::string, ScanCallbackList> ScanCompleteCallbackMap;
   friend class NetworkStateHandlerTest;
+  friend class WizardControllerFlowTest;
   FRIEND_TEST_ALL_PREFIXES(NetworkStateHandlerTest, NetworkStateHandlerStub);
 
   // Non-const getters for managed entries. These are const so that they can
@@ -281,6 +295,9 @@ class CHROMEOS_EXPORT NetworkStateHandler
   // TODO(stevenjb): Move this to NetworkConfigurationHandler.
   std::string connecting_network_;
 
+  // List of interfaces on which portal check is enabled.
+  std::string check_portal_list_;
+
   // Callbacks to run when a scan for the technology type completes.
   ScanCompleteCallbackMap scan_complete_callbacks_;