Add TechnologyState to NetworkStateHandler.

chromeos/network/network_state_handler_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_state_handler.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 198 matching lines @@
                 NetworkStateHandler::kMatchTypeWireless)->path());
   EXPECT_EQ(flimflam::kStateOnline,
             test_observer_->default_network_connection_state());
 }
 
 TEST_F(NetworkStateHandlerTest, TechnologyChanged) {
   SetupNetworkStateHandler();
   message_loop_.RunUntilIdle();
   EXPECT_EQ(1u, test_observer_->manager_changed_count());
   // Enable a technology.
-  EXPECT_FALSE(network_state_handler_->TechnologyEnabled(flimflam::kTypeWimax));
+  EXPECT_NE(NetworkStateHandler::TECHNOLOGY_ENABLED,
+            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
   network_state_handler_->SetTechnologyEnabled(
       flimflam::kTypeWimax, true, network_handler::ErrorCallback());
+  // The technology state should immediately change to ENABLING and we should
+  // receive a manager changed callback.
+  EXPECT_EQ(2u, test_observer_->manager_changed_count());
+  EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_ENABLING,
+            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
   message_loop_.RunUntilIdle();
-  // Ensure we get a manager changed callback when we change a property.
-  EXPECT_EQ(2u, test_observer_->manager_changed_count());
-  EXPECT_TRUE(network_state_handler_->TechnologyEnabled(flimflam::kTypeWimax));
+  // Ensure we receive another manager changed callbacks when the technology
+  // becomes enabled.
+  EXPECT_EQ(3u, test_observer_->manager_changed_count());
+  EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_ENABLED,
+            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
 }
 
 TEST_F(NetworkStateHandlerTest, ServicePropertyChanged) {
   SetupNetworkStateHandler();
   message_loop_.RunUntilIdle();
   // Set a service property.
   const std::string eth0 = "stub_ethernet";
   EXPECT_EQ("", network_state_handler_->GetNetworkState(eth0)->security());
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(eth0));
   base::StringValue security_value("TestSecurity");
@@ skipping 68 matching lines @@
   // No default network updates for signal strength changes.
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
       dbus::ObjectPath(wifi1),
       flimflam::kSignalStrengthProperty, base::FundamentalValue(32),
       base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
   message_loop_.RunUntilIdle();
   EXPECT_EQ(3u, test_observer_->default_network_change_count());
 }
 
 }  // namespace chromeos