Cleanup network type matching.

chromeos/network/network_state_handler_unittest.cc

Index: chromeos/network/network_state_handler_unittest.cc
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index e32e4a57bd92766d41163a1eaff9008ef6a3f7eb..7983283812d43c1306ea9eccd8c293cb318f3bf4 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -19,6 +19,7 @@
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler_observer.h"
+#include "chromeos/network/shill_property_util.h"
 #include "dbus/object_path.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ -208,13 +209,20 @@ TEST_F(NetworkStateHandlerTest, NetworkStateHandlerStub) {
             test_observer_->default_network());
   EXPECT_EQ(kShillManagerClientStubDefaultService,
             network_state_handler_->ConnectedNetworkByType(
-                NetworkStateHandler::kMatchTypeDefault)->path());
+                NetworkTypePattern::Default())->path());
   EXPECT_EQ(kShillManagerClientStubDefaultService,
             network_state_handler_->ConnectedNetworkByType(
-                flimflam::kTypeEthernet)->path());
+                NetworkTypePattern::Ethernet())->path());
   EXPECT_EQ(kShillManagerClientStubDefaultWireless,
             network_state_handler_->ConnectedNetworkByType(
-                NetworkStateHandler::kMatchTypeWireless)->path());
+                NetworkTypePattern::Wireless())->path());
+  EXPECT_EQ(kShillManagerClientStubCellular,
+            network_state_handler_->FirstNetworkByType(
+                NetworkTypePattern::Mobile())->path());
+  EXPECT_EQ(kShillManagerClientStubCellular,
+            network_state_handler_->FirstNetworkByType(
+                                        NetworkTypePattern::Primitive(
+                                            flimflam::kTypeCellular))->path());
   EXPECT_EQ(flimflam::kStateOnline,
             test_observer_->default_network_connection_state());
 }
@@ -224,24 +232,31 @@ TEST_F(NetworkStateHandlerTest, TechnologyChanged) {
   size_t initial_changed_count = test_observer_->manager_changed_count();
   // Disable a technology.
   network_state_handler_->SetTechnologyEnabled(
-      flimflam::kTypeWimax, false, network_handler::ErrorCallback());
+      NetworkTypePattern::Primitive(flimflam::kTypeWimax),
+      false,
+      network_handler::ErrorCallback());
   EXPECT_NE(NetworkStateHandler::TECHNOLOGY_ENABLED,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
   EXPECT_EQ(initial_changed_count + 1, test_observer_->manager_changed_count());
   // Enable a technology.
   network_state_handler_->SetTechnologyEnabled(
-      flimflam::kTypeWimax, true, network_handler::ErrorCallback());
+      NetworkTypePattern::Primitive(flimflam::kTypeWimax),
+      true,
+      network_handler::ErrorCallback());
   // The technology state should immediately change to ENABLING and we should
   // receive a manager changed callback.
   EXPECT_EQ(initial_changed_count + 2, test_observer_->manager_changed_count());
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_ENABLING,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
   message_loop_.RunUntilIdle();
   // Ensure we receive 2 manager changed callbacks when the technology becomes
   // avalable and enabled.
   EXPECT_EQ(initial_changed_count + 4, test_observer_->manager_changed_count());
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_ENABLED,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
 }
 
 TEST_F(NetworkStateHandlerTest, TechnologyState) {
@@ -250,29 +265,36 @@ TEST_F(NetworkStateHandlerTest, TechnologyState) {
   manager_test->RemoveTechnology(flimflam::kTypeWimax);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_UNAVAILABLE,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
 
   manager_test->AddTechnology(flimflam::kTypeWimax, false);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_AVAILABLE,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
 
   manager_test->SetTechnologyInitializing(flimflam::kTypeWimax, true);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_UNINITIALIZED,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
 
   manager_test->SetTechnologyInitializing(flimflam::kTypeWimax, false);
   network_state_handler_->SetTechnologyEnabled(
-      flimflam::kTypeWimax, true, network_handler::ErrorCallback());
+      NetworkTypePattern::Primitive(flimflam::kTypeWimax),
+      true,
+      network_handler::ErrorCallback());
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_ENABLED,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
 
   manager_test->RemoveTechnology(flimflam::kTypeWimax);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_UNAVAILABLE,
-            network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
+            network_state_handler_->GetTechnologyState(
+                NetworkTypePattern::Primitive(flimflam::kTypeWimax)));
 }
 
 TEST_F(NetworkStateHandlerTest, ServicePropertyChanged) {