Reland: Add test for system tray network menu icon for extension-controlled networks

ash/common/system/tray/system_tray.cc

 // Copyright (c) 2012 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/common/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 198 matching lines @@
     : TrayBackgroundView(wm_shelf),
       web_notification_tray_(nullptr),
       detailed_item_(nullptr),
       default_bubble_height_(0),
       hide_notifications_(false),
       full_system_tray_menu_(false),
       tray_accessibility_(nullptr),
       tray_audio_(nullptr),
       tray_cast_(nullptr),
       tray_date_(nullptr),
+      tray_network_(nullptr),
       tray_tiles_(nullptr),
       tray_system_info_(nullptr),
       tray_update_(nullptr),
       screen_capture_tray_item_(nullptr),
       screen_share_tray_item_(nullptr) {
   if (MaterialDesignController::IsShelfMaterial()) {
     SetInkDropMode(InkDropMode::ON);
     SetContentsBackground(false);
   } else {
     SetContentsBackground(true);
@@ skipping 54 matching lines @@
   tray_update_ = new TrayUpdate(this);
 
 #if defined(OS_CHROMEOS)
   AddTrayItem(new TraySessionLengthLimit(this));
   AddTrayItem(new TrayEnterprise(this));
   AddTrayItem(new TraySupervisedUser(this));
   AddTrayItem(new TrayIME(this));
   AddTrayItem(tray_accessibility_);
   AddTrayItem(new TrayTracing(this));
   AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
-  AddTrayItem(new TrayNetwork(this));
+  tray_network_ = new TrayNetwork(this);
+  AddTrayItem(tray_network_);
   AddTrayItem(new TrayVPN(this));
   AddTrayItem(new TraySms(this));
   AddTrayItem(new TrayBluetooth(this));
   tray_cast_ = new TrayCast(this);
   AddTrayItem(tray_cast_);
   screen_capture_tray_item_ = new ScreenCaptureTrayItem(this);
   AddTrayItem(screen_capture_tray_item_);
   screen_share_tray_item_ = new ScreenShareTrayItem(this);
   AddTrayItem(screen_share_tray_item_);
   AddTrayItem(new MultiProfileMediaTrayItem(this));
@@ skipping 497 matching lines @@
 }
 
 TrayCast* SystemTray::GetTrayCastForTesting() const {
   return tray_cast_;
 }
 
 TrayDate* SystemTray::GetTrayDateForTesting() const {
   return tray_date_;
 }
 
+TrayNetwork* SystemTray::GetTrayNetworkForTesting() const {
+  return tray_network_;
+}
+
 TraySystemInfo* SystemTray::GetTraySystemInfoForTesting() const {
   return tray_system_info_;
 }
 
 TrayTiles* SystemTray::GetTrayTilesForTesting() const {
   return tray_tiles_;
 }
 
 TrayUpdate* SystemTray::GetTrayUpdateForTesting() const {
   return tray_update_;
@@ skipping 88 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash