chromeos: Fix crash when clicking on networking menu under mash

ash/system/network/network_list.cc

Index: ash/system/network/network_list.cc
diff --git a/ash/system/network/network_list.cc b/ash/system/network/network_list.cc
index f882160deec00f5f2385c239b94d8873eac82340..94b9efd3f6203fff9180b3e0373138c0ee1e216c 100644
--- a/ash/system/network/network_list.cc
+++ b/ash/system/network/network_list.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
@@ -525,14 +526,19 @@ NetworkListView::UpdateNetworkListEntries() {
   // Keep an index where the next child should be inserted.
   int index = 0;
 
+  // Show a warning that the connection might be monitored if connected to a VPN
+  // or if the default network has a proxy installed.
   bool show_connection_warning =
       !!NetworkHandler::Get()->network_state_handler()->ConnectedNetworkByType(
           NetworkTypePattern::VPN());
-  show_connection_warning =
-      show_connection_warning || NetworkHandler::Get()
-                                     ->ui_proxy_config_service()
-                                     ->HasDefaultNetworkProxyConfigured();
-
+  // TODO(jamescook): Create a UIProxyConfigService for mash. This will require
+  // the mojo pref service to work with Local State. http://crbug.com/718072
+  if (Shell::GetAshConfig() != Config::MASH) {
+    show_connection_warning =
+        show_connection_warning || NetworkHandler::Get()
+                                       ->ui_proxy_config_service()

[stevenjb, 2017/05/03 22:11:39]

We could just test ui_proxy_config_service() and then when it gets added this
would Just Work.

[James Cook, 2017/05/03 22:29:32]

Done.

+                                       ->HasDefaultNetworkProxyConfigured();
+  }
   if (show_connection_warning) {
     if (!connection_warning_)
       connection_warning_ = CreateConnectionWarning();