NetworkState cleanup, pass properties to InitialPropertiesReceived

chromeos/network/network_change_notifier_chromeos_unittest.cc

 // 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.
 
 #include "chromeos/network/network_change_notifier_chromeos.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string_split.h"
@@ skipping 18 matching lines @@
 struct NotifierState {
   net::NetworkChangeNotifier::ConnectionType type;
   const char* service_path;
   const char* ip_address;
   const char* dns_servers;
 };
 
 struct DefaultNetworkState {
   bool is_connected;
   const char* type;
-  const char* technology;
+  const char* network_technology;
   const char* service_path;
   const char* ip_address;
   const char* dns_servers;
 };
 
 struct NotifierUpdateTestCase {
   const char* test_description;
   NotifierState initial_state;
   DefaultNetworkState default_network_state;
   NotifierState expected_state;
@@ skipping 75 matching lines @@
   }
 
   // Sets the default network state used for notifier updates.
   void SetDefaultNetworkState(
       const DefaultNetworkState& default_network_state) {
     if (default_network_state.is_connected)
       default_network_.connection_state_ = flimflam::kStateOnline;
     else
       default_network_.connection_state_ = flimflam::kStateConfiguration;
     default_network_.type_ = default_network_state.type;
-    default_network_.technology_ = default_network_state.technology;
+    default_network_.network_technology_ =
+        default_network_state.network_technology;
     default_network_.path_ = default_network_state.service_path;
     default_network_.ip_address_ = default_network_state.ip_address;
     std::vector<std::string> dns_servers;
     base::SplitString(default_network_state.dns_servers, ',', &dns_servers);
     default_network_.dns_servers_ = dns_servers;
   }
 
   // Process an default network update based on the state of |default_network_|.
   void ProcessDefaultNetworkUpdate(bool* type_changed,
                                    bool* ip_changed,
@@ skipping 78 matching lines @@
     bool type_changed = false, ip_changed = false, dns_changed = false;
     ProcessDefaultNetworkUpdate(&type_changed, &ip_changed, &dns_changed);
     VerifyNotifierState(test_cases[i].expected_state);
     EXPECT_TRUE(type_changed == test_cases[i].expected_type_changed);
     EXPECT_TRUE(ip_changed == test_cases[i].expected_ip_changed);
     EXPECT_TRUE(dns_changed == test_cases[i].expected_dns_changed);
   }
 }
 
 }  // namespace chromeos