Settings: Network: Merge Tether networks into Mobile subpage

chrome/test/data/webui/settings/fake_networking_private.js

Index: chrome/test/data/webui/settings/fake_networking_private.js
diff --git a/chrome/test/data/webui/settings/fake_networking_private.js b/chrome/test/data/webui/settings/fake_networking_private.js
index d6421e70b73f519a0d897d8bce909251abafe9c8..f067574ec7ceae99991fbfd25e267c31ed9a6576 100644
--- a/chrome/test/data/webui/settings/fake_networking_private.js
+++ b/chrome/test/data/webui/settings/fake_networking_private.js
@@ -29,6 +29,7 @@ cr.define('settings', function() {
         Ethernet: {Type: 'Ethernet', State: 'Enabled'},
         WiFi: {Type: 'WiFi', State: ''},
         Cellular: {Type: 'Cellular', State: ''},
+        Tether: {Type: 'Tether', State: ''},
         WiMAX: {Type: 'WiMAX', State: ''},
       };
 
@@ -56,7 +57,13 @@ cr.define('settings', function() {
     getProperties: assertNotReached,
 
     /** @override */
-    getManagedProperties: assertNotReached,
+    getManagedProperties: function(guid) {
+      var result = this.networkStates_.find(function(state) {
+        return state.GUID == guid;
+      });
+      // TODO(stevenjb): Convert state to ManagedProperties.
+      return result;
+    },
 
     /** @override */
     getState: assertNotReached,