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 10 matching lines @@
 
   // ManagedState overrides
   virtual bool PropertyChanged(const std::string& key,
                                const base::Value& value) OVERRIDE;
 
   // Accessors
   const std::string& security() const { return security_; }
   const std::string& technology() const { return technology_; }
   const std::string& ip_address() const { return ip_address_; }
   const std::string& device_path() const { return device_path_; }
-  const std::string& state() const { return state_; }
+  const std::string& connection_state() const { return connection_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;
 
   // Helpers (used e.g. when a state is cached)
-  static bool StateIsConnected(const std::string& state);
-  static bool StateIsConnecting(const std::string& state);
+  static bool StateIsConnected(const std::string& connection_state);
+  static bool StateIsConnecting(const std::string& connection_state);
 
  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 connection_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_