Migrate simple ash Shell metrics users.

ash/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/system/chromeos/network/tray_vpn.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_recorder.h"
-#include "ash/shell.h"
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/system/chromeos/network/vpn_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_chromeos_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/chromeos/network/network_icon.h"
@@ skipping 102 matching lines @@
 
 views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
   if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
   if (status == LoginStatus::NOT_LOGGED_IN)
     return NULL;
   if (!tray::VpnDefaultView::ShouldShow())
     return NULL;
 
-  bool userAddingRunning = ash::Shell::GetInstance()
-                               ->session_state_delegate()
-                               ->IsInSecondaryLoginScreen();
+  const bool is_in_secondary_login_screen =
+      WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
   default_ = new tray::VpnDefaultView(
-      this, status != LoginStatus::LOCKED && !userAddingRunning);
+      this, status != LoginStatus::LOCKED && !is_in_secondary_login_screen);
 
   return default_;
 }
 
 views::View* TrayVPN::CreateDetailedView(LoginStatus status) {
   CHECK(detailed_ == NULL);
   if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
 
-  Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-      ash::UMA_STATUS_AREA_DETAILED_VPN_VIEW);
+  WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_VPN_VIEW);
   detailed_ = new tray::NetworkStateListDetailedView(
       this, tray::NetworkStateListDetailedView::LIST_TYPE_VPN, status);
   detailed_->Init();
   return detailed_;
 }
 
 void TrayVPN::DestroyTrayView() {
 }
 
 void TrayVPN::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayVPN::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 void TrayVPN::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash