Improve NetworkStateHandler API

chromeos/network/network_state.h

Index: chromeos/network/network_state.h
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index b5f73761ae7e63cf5a9f36e9abfc0762bb2aa4fd..0cdb6422c7752e36c196f49f6780817864aaa298 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -37,10 +37,21 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   bool IsConnectedState() const;
   bool IsConnectingState() const;
 
+  // Returns true if |type_| == |match_type|, or it matches one of the
+  // following special match types:
+  // * kMatchTypeDefault to match any network

[pneubeck (no reviews), 2012/12/19 15:22:38]

Why not call it kMatchTypeAny?

[stevenjb, 2012/12/19 18:01:07]

I wanted to match the intention here; "Any" implies that it is arbitrary. I
could have used "First", but that is really an implementation detail.

Would it be more clear if these were defined in NetworkStateHandler which is
what uses them (and the logic put there also)?

[pneubeck (no reviews), 2012/12/19 19:40:06]

But First makes only sense in the context of the functions of
NetworkStateHandler, where it's already written:
 "first/primary connected network of type |type|"
In that sentence, "Any" is completely understandable.

I don't see a problem with Any.
If you move it, you get a dependency from this class back to the handler. Not
sure, if that's worth it.

+  // * kMatchTypeNonVirtual to match non virtual networks
+  // * kMatchTypeWireless to match wireless networks
+  bool MatchesType(const std::string& match_type) const;
+
   // Helpers (used e.g. when a state is cached)
   static bool StateIsConnected(const std::string& state);
   static bool StateIsConnecting(const std::string& state);
 
+  static const char kMatchTypeDefault[];
+  static const char kMatchTypeWireless[];
+  static const char kMatchTypeNonVirtual[];
+
  private:
   friend class NetworkStateHandler;