Add Tether to Mobile NetworkTypePattern.

chromeos/network/network_type_pattern.cc

Index: chromeos/network/network_type_pattern.cc
diff --git a/chromeos/network/network_type_pattern.cc b/chromeos/network/network_type_pattern.cc
index dbda85ba2a067523a4373f021babf7fabb16704b..0cfe2d5ee16f11bc932621b0dfffa06e40090d8f 100644
--- a/chromeos/network/network_type_pattern.cc
+++ b/chromeos/network/network_type_pattern.cc
@@ -15,11 +15,9 @@ namespace chromeos {
 namespace {
 
 const char kPatternDefault[] = "PatternDefault";
-const char kPatternEthernet[] = "PatternEthernet";
 const char kPatternWireless[] = "PatternWireless";
 const char kPatternMobile[] = "PatternMobile";
 const char kPatternNonVirtual[] = "PatternNonVirtual";
-const char kPatternTether[] = "PatternTether";
 
 enum NetworkTypeBitFlag {
   kNetworkTypeNone = 0,
@@ -69,7 +67,8 @@ NetworkTypePattern NetworkTypePattern::Wireless() {
 
 // static
 NetworkTypePattern NetworkTypePattern::Mobile() {
-  return NetworkTypePattern(kNetworkTypeCellular | kNetworkTypeWimax);
+  return NetworkTypePattern(kNetworkTypeCellular | kNetworkTypeWimax |
+                            kNetworkTypeTether);
 }
 
 // static
@@ -133,17 +132,14 @@ bool NetworkTypePattern::MatchesPattern(
 std::string NetworkTypePattern::ToDebugString() const {
   if (Equals(Default()))
     return kPatternDefault;
-  if (Equals(Ethernet()))
-    return kPatternEthernet;
   if (Equals(Wireless()))
     return kPatternWireless;
   if (Equals(Mobile()))
     return kPatternMobile;
   if (Equals(NonVirtual()))
     return kPatternNonVirtual;
-  if (Equals(Tether()))
-    return kPatternTether;
 
+  // Note: shill_type_to_flag includes kTypeTether.
   std::string str;
   for (size_t i = 0; i < arraysize(shill_type_to_flag); ++i) {
     if (!(pattern_ & shill_type_to_flag[i].bit_flag))