Improve NetworkStateHandler API

chromeos/network/network_state.h

 // Copyright (c) 2012 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_NETWORK_NETWORK_STATE_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
 
 #include "chromeos/network/managed_state.h"
 
 namespace chromeos {
@@ skipping 19 matching lines @@
   const std::string& device_path() const { return device_path_; }
   const std::string& state() const { return state_; }
   const std::string& error() const { return error_; }
   const std::string& activation_state() const { return activation_state_; }
   const std::string& roaming() const { return roaming_; }
   int signal_strength() const { return signal_strength_; }
 
   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;
 
   // Called by NetworkStateHandler when the ip config changes.
   void set_ip_address(const std::string& ip_address) {
     ip_address_ = ip_address;
   }
 
   // Common Network Service properties
   std::string security_;
   std::string device_path_;
   std::string ip_address_;
   std::string state_;
   std::string error_;
   // Wireless properties
   int signal_strength_;
   // Cellular properties
   std::string technology_;
   std::string activation_state_;
   std::string roaming_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_H_