Manual Revert of Reland: chromeos: Fix shelf appearing at login screen under mash (patchset #7 id:1…

ash/mus/test/wm_test_base.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/mus/test/wm_test_base.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "ash/common/session/session_controller.h"
-#include "ash/common/wm_shell.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/test/wm_test_helper.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
-#include "ash/public/cpp/session_types.h"
-#include "ash/public/interfaces/session_controller.mojom.h"
 #include "ash/test/wm_window_aura_test_api.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display.h"
 
 namespace ash {
@@ skipping 134 matching lines @@
 void WmTestBase::SetUp() {
   setup_called_ = true;
   // Disable animations during tests.
   zero_duration_mode_ = base::MakeUnique<ui::ScopedAnimationDurationScaleMode>(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   // Most tests expect a minimum size of 0x0.
   minimum_size_lock_ =
       base::MakeUnique<WmWindowAuraTestApi::GlobalMinimumSizeLock>();
   test_helper_.reset(new WmTestHelper);
   test_helper_->Init();
-
-  // Most tests assume the user is logged in (and hence the shelf is created).
-  SimulateUserLogin();
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
   minimum_size_lock_.reset();
   zero_duration_mode_.reset();
 }
 
-void WmTestBase::SimulateUserLogin() {
-  SessionController* session_controller = WmShell::Get()->session_controller();
-
-  // Simulate the first user logging in.
-  mojom::UserSessionPtr session = mojom::UserSession::New();
-  session->session_id = 1;
-  session->type = user_manager::USER_TYPE_REGULAR;
-  const std::string email("ash.user@example.com");
-  session->serialized_account_id = AccountId::FromUserEmail(email).Serialize();
-  session->display_name = "Ash User";
-  session->display_email = email;
-  session_controller->UpdateUserSession(std::move(session));
-
-  // Simulate the user session becoming active.
-  mojom::SessionInfoPtr info = mojom::SessionInfo::New();
-  info->max_users = 10;
-  info->can_lock_screen = true;
-  info->should_lock_screen_automatically = false;
-  info->add_user_session_policy = AddUserSessionPolicy::ALLOWED;
-  info->state = session_manager::SessionState::ACTIVE;
-  session_controller->SetSessionInfo(std::move(info));
-}
-
-
 }  // namespace mus
 }  // namespace ash