Add Tether to Mobile NetworkTypePattern.

chromeos/network/network_type_pattern_unittest.cc

Index: chromeos/network/network_type_pattern_unittest.cc
diff --git a/chromeos/network/network_type_pattern_unittest.cc b/chromeos/network/network_type_pattern_unittest.cc
index 142f403b0c67a667af5383b83eb7085f5dee7d1c..53f10eaf192ffeebe52fc8694f44548275ad324e 100644
--- a/chromeos/network/network_type_pattern_unittest.cc
+++ b/chromeos/network/network_type_pattern_unittest.cc
@@ -22,7 +22,9 @@ class NetworkTypePatternTest : public testing::Test {
         non_virtual_(NetworkTypePattern::NonVirtual()),
         wimax_(NetworkTypePattern::Wimax()),
         wireless_(NetworkTypePattern::Wireless()),
-        tether_(NetworkTypePattern::Tether()) {}
+        tether_(NetworkTypePattern::Tether()),
+        vpn_(NetworkTypePattern::VPN()),
+        wifi_(NetworkTypePattern::WiFi()) {}
 
   bool MatchesPattern(const NetworkTypePattern& a,
                       const NetworkTypePattern& b) {
@@ -40,21 +42,38 @@ class NetworkTypePatternTest : public testing::Test {
   const NetworkTypePattern wimax_;
   const NetworkTypePattern wireless_;
   const NetworkTypePattern tether_;
+  const NetworkTypePattern vpn_;
+  const NetworkTypePattern wifi_;
 };
 
 }  // namespace
 
 TEST_F(NetworkTypePatternTest, MatchesType) {
+  // Mobile contains Cellular, Wimax, and Tether.
   EXPECT_TRUE(mobile_.MatchesType(shill::kTypeCellular));
   EXPECT_TRUE(mobile_.MatchesType(shill::kTypeWimax));
+  EXPECT_TRUE(mobile_.MatchesType(kTypeTether));
   EXPECT_FALSE(mobile_.MatchesType(shill::kTypeWifi));
+  EXPECT_FALSE(mobile_.MatchesType(shill::kTypeEthernet));
+  EXPECT_FALSE(mobile_.MatchesType(shill::kTypeVPN));
 
+  // Wireless contains Wifi, Cellular, and Wimax.
   EXPECT_TRUE(wireless_.MatchesType(shill::kTypeWifi));
   EXPECT_TRUE(wireless_.MatchesType(shill::kTypeCellular));
   EXPECT_TRUE(wireless_.MatchesType(shill::kTypeWimax));
   EXPECT_FALSE(wireless_.MatchesType(shill::kTypeEthernet));
-
+  EXPECT_FALSE(wireless_.MatchesType(shill::kTypeVPN));
   EXPECT_FALSE(wireless_.MatchesType(kTypeTether));
+
+  // Non-virtual contains everything except VPN and Tether.
+  EXPECT_TRUE(non_virtual_.MatchesType(shill::kTypeCellular));
+  EXPECT_TRUE(non_virtual_.MatchesType(shill::kTypeWifi));
+  EXPECT_TRUE(non_virtual_.MatchesType(shill::kTypeEthernet));
+  EXPECT_TRUE(non_virtual_.MatchesType(shill::kTypeWimax));
+  EXPECT_FALSE(non_virtual_.MatchesType(shill::kTypeVPN));
+  EXPECT_FALSE(non_virtual_.MatchesType(kTypeTether));
+
+  EXPECT_TRUE(wimax_.MatchesType(shill::kTypeWimax));
   EXPECT_FALSE(wimax_.MatchesType(kTypeTether));
 }
 
@@ -104,8 +123,15 @@ TEST_F(NetworkTypePatternTest, Primitive) {
 
 TEST_F(NetworkTypePatternTest, ToDebugString) {
   EXPECT_EQ(default_.ToDebugString(), "PatternDefault");
+  EXPECT_EQ(wireless_.ToDebugString(), "PatternWireless");
   EXPECT_EQ(mobile_.ToDebugString(), "PatternMobile");
-  EXPECT_EQ(cellular_.ToDebugString(), "cellular");
+  EXPECT_EQ(non_virtual_.ToDebugString(), "PatternNonVirtual");
+  EXPECT_EQ(ethernet_.ToDebugString(), shill::kTypeEthernet);
+  EXPECT_EQ(cellular_.ToDebugString(), shill::kTypeCellular);
+  EXPECT_EQ(wimax_.ToDebugString(), shill::kTypeWimax);
+  EXPECT_EQ(tether_.ToDebugString(), kTypeTether);
+  EXPECT_EQ(wifi_.ToDebugString(), shill::kTypeWifi);
+  EXPECT_EQ(vpn_.ToDebugString(), shill::kTypeVPN);
 }
 
 }  // namespace chromeos