chromeos: Fix crash when clicking on networking menu under mash

ash/system/network/network_list.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/network/network_list.h"
 
 #include <memory>
 
+#include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_info.h"
 #include "ash/system/network/network_state_list_detailed_view.h"
 #include "ash/system/networking_config_delegate.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
@@ skipping 499 matching lines @@
     container()->ScrollRectToVisible(selected_view->bounds());
 }
 
 std::unique_ptr<std::set<std::string>>
 NetworkListView::UpdateNetworkListEntries() {
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // 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();
     PlaceViewAtIndex(connection_warning_, index++);
   }
 
   // First add high-priority networks (not Wi-Fi nor cellular).
   std::unique_ptr<std::set<std::string>> new_guids =
       UpdateNetworkChildren(NetworkInfo::Type::UNKNOWN, index);
   index += new_guids->size();
@@ skipping 270 matching lines @@
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
   style.SetupLabel(label);
   connection_warning->AddView(TriView::Container::CENTER, label);
 
   // Nothing to the right of the text.
   connection_warning->SetContainerVisible(TriView::Container::END, false);
   return connection_warning;
 }
 
 }  // namespace ash