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

ash/common/system/tray/system_tray.h

 // 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.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 11 matching lines @@
 class KeyEventWatcher;
 enum class LoginStatus;
 class ScreenTrayItem;
 class SystemBubbleWrapper;
 class SystemTrayDelegate;
 class SystemTrayItem;
 class TrayAccessibility;
 class TrayAudio;
 class TrayCast;
 class TrayDate;
+class TrayNetwork;
 class TraySystemInfo;
 class TrayTiles;
 class TrayUpdate;
 class WebNotificationTray;
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
@@ skipping 115 matching lines @@
 
   TrayAccessibility* GetTrayAccessibilityForTest() {
     return tray_accessibility_;
   }
 
   // Get the tray item view (or NULL) for a given |tray_item| in a unit test.
   views::View* GetTrayItemViewForTest(SystemTrayItem* tray_item);
 
   TrayCast* GetTrayCastForTesting() const;
   TrayDate* GetTrayDateForTesting() const;
+  TrayNetwork* GetTrayNetworkForTesting() const;
   TraySystemInfo* GetTraySystemInfoForTesting() const;
   TrayTiles* GetTrayTilesForTesting() const;
   TrayUpdate* GetTrayUpdateForTesting() const;
 
   // Activates the system tray bubble.
   void ActivateBubble();
 
  private:
   class ActivationObserver;
 
@@ skipping 83 matching lines @@
   // This is true when the displayed system tray menu is a full tray menu,
   // otherwise a single line item menu like the volume slider is shown.
   // Note that the value is only valid when |system_bubble_| is true.
   bool full_system_tray_menu_;
 
   // These objects are not owned by this class.
   TrayAccessibility* tray_accessibility_;
   TrayAudio* tray_audio_;  // May be null.
   TrayCast* tray_cast_;
   TrayDate* tray_date_;    // null for material design.
+  TrayNetwork* tray_network_;
   TrayTiles* tray_tiles_;  // only used in material design.
   TraySystemInfo* tray_system_info_;  // only used in material design.
   TrayUpdate* tray_update_;
 
   // A reference to the Screen share and capture item.
   ScreenTrayItem* screen_capture_tray_item_;  // not owned
   ScreenTrayItem* screen_share_tray_item_;    // not owned
 
   // TODO(oshima): Remove this when crbug.com/651242 is fixed.
   bool activating_ = false;
 
   std::unique_ptr<KeyEventWatcher> key_event_watcher_;
 
   std::unique_ptr<ActivationObserver> activation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_