Remove ArcSessionManager::SetShelfDelegateForTesting.

chrome/browser/chromeos/arc/arc_session_manager.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 "chrome/browser/chromeos/arc/arc_session_manager.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
@@ skipping 42 matching lines @@
 namespace arc {
 
 namespace {
 
 // Weak pointer.  This class is owned by ArcServiceManager.
 ArcSessionManager* g_arc_session_manager = nullptr;
 
 // Skip creating UI in unit tests
 bool g_disable_ui_for_testing = false;
 
-// Use specified ash::ShelfDelegate for unit tests.
-ash::ShelfDelegate* g_shelf_delegate_for_testing = nullptr;
-
 // The Android management check is disabled by default, it's used only for
 // testing.
 bool g_enable_check_android_management_for_testing = false;
 
 // Maximum amount of time we'll wait for ARC to finish booting up. Once this
 // timeout expires, keep ARC running in case the user wants to file feedback,
 // but present the UI to try again.
 constexpr base::TimeDelta kArcSignInTimeout = base::TimeDelta::FromMinutes(5);
 
-ash::ShelfDelegate* GetShelfDelegate() {
-  if (g_shelf_delegate_for_testing)
-    return g_shelf_delegate_for_testing;
-  if (ash::WmShell::HasInstance())
-    return ash::WmShell::Get()->shelf_delegate();
-  return nullptr;
-}
-
 }  // namespace
 
 ArcSessionManager::ArcSessionManager(
     std::unique_ptr<ArcSessionRunner> arc_session_runner)
     : arc_session_runner_(std::move(arc_session_runner)),
       attempt_user_exit_callback_(base::Bind(chrome::AttemptUserExit)),
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!g_arc_session_manager);
   g_arc_session_manager = this;
@@ skipping 49 matching lines @@
 
 // static
 void ArcSessionManager::DisableUIForTesting() {
   g_disable_ui_for_testing = true;
   // TODO(hidehiko): When the dependency to ArcAuthNotification from this
   // class is removed, we should remove this as well.
   ArcAuthNotification::DisableForTesting();
 }
 
 // static
-void ArcSessionManager::SetShelfDelegateForTesting(
-    ash::ShelfDelegate* shelf_delegate) {
-  g_shelf_delegate_for_testing = shelf_delegate;
-}
-
-// static
 void ArcSessionManager::EnableCheckAndroidManagementForTesting() {
   g_enable_check_android_management_for_testing = true;
 }
 
 void ArcSessionManager::OnSessionReady() {
   for (auto& observer : arc_session_observer_list_)
     observer.OnSessionReady();
 }
 
 void ArcSessionManager::OnSessionStopped(StopReason reason) {
@@ skipping 361 matching lines @@
       IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_);
   if (!is_play_store_managed) {
     // Update UMA only for non-Managed cases.
     UpdateOptInActionUMA(is_play_store_enabled ? OptInActionType::OPTED_IN
                                                : OptInActionType::OPTED_OUT);
 
     if (!is_play_store_enabled) {
       // Remove the pinned Play Store icon launcher in Shelf.
       // This is only for non-Managed cases. In managed cases, it is expected
       // to be "disabled" rather than "removed", so keep it here.
-      ash::ShelfDelegate* shelf_delegate = GetShelfDelegate();
+      auto* shelf_delegate = ash::WmShell::HasInstance()
+                                 ? ash::WmShell::Get()->shelf_delegate()
+                                 : nullptr;
       if (shelf_delegate)
         shelf_delegate->UnpinAppWithID(ArcSupportHost::kHostAppId);
     }
   }
 
   if (support_host_)
     support_host_->SetArcManaged(is_play_store_managed);
 
   // Hide auth notification if it was opened before and arc.enabled pref was
   // explicitly set to true or false.
@@ skipping 450 matching lines @@
 
 #undef MAP_STATE
 
   // Some compilers report an error even if all values of an enum-class are
   // covered exhaustively in a switch statement.
   NOTREACHED() << "Invalid value " << static_cast<int>(state);
   return os;
 }
 
 }  // namespace arc