mutash: Convert ScreenShareTest/ScreenCaptureTest to AshTest

ash/common/system/chromeos/network/tray_vpn.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/chromeos/network/tray_vpn.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
@@ skipping 25 matching lines @@
                        public ui::network_icon::AnimationObserver {
  public:
   VpnDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {}
 
   ~VpnDefaultView() override {
     ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   static bool ShouldShow() {
+    VPNDelegate* vpn_delegate =
+        WmShell::Get()->system_tray_delegate()->GetVPNDelegate();
+    // Tests may not have a VPN delegate. They should not show the VPN entry.
+    if (!vpn_delegate)
+      return false;
+
     // Show the VPN entry in the ash tray bubble if at least one third-party VPN
     // provider is installed.
-    if (WmShell::Get()
-            ->system_tray_delegate()
-            ->GetVPNDelegate()
-            ->HaveThirdPartyVPNProviders()) {
+    if (vpn_delegate->HaveThirdPartyVPNProviders())
       return true;
-    }
 
     // Also show the VPN entry if at least one VPN network is configured.
     NetworkStateHandler* const handler =
         NetworkHandler::Get()->network_state_handler();
     if (handler->FirstNetworkByType(NetworkTypePattern::VPN()))
       return true;
     return false;
   }
 
   void Update() {
@@ skipping 85 matching lines @@
 }
 
 TrayVPN::~TrayVPN() {}
 
 views::View* TrayVPN::CreateTrayView(LoginStatus status) {
   return NULL;
 }
 
 views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
   if (!chromeos::NetworkHandler::IsInitialized())

[James Cook, 2016/10/14 00:14:40]

ash_unittests early-exit here and don't try to create the VPN entry. If they did
they would crash on a null VPNDelegate (since we don't have one of those in
tests).

     return NULL;
   if (status == LoginStatus::NOT_LOGGED_IN)
     return NULL;
   if (!tray::VpnDefaultView::ShouldShow())
     return NULL;
 
   const bool is_in_secondary_login_screen =
       WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
   default_ = new tray::VpnDefaultView(
@@ skipping 29 matching lines @@
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash