Split ArcAuthNotification UI control flag from ArcSessionManager.

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 125 matching lines @@
           chromeos::switches::kEnableArcOOBEOptIn))
     return false;
   if (!chromeos::LoginDisplayHost::default_host())
     return false;
   return true;
 }
 
 // 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() {
@@ skipping 306 matching lines @@
   }
 }
 
 void ArcSessionManager::OnIsSyncingChanged() {
   sync_preferences::PrefServiceSyncable* const pref_service_syncable =
       PrefServiceSyncableFromProfile(profile_);
   if (!pref_service_syncable->IsSyncing())
     return;
 
   pref_service_syncable->RemoveObserver(this);
-  if (!g_disable_ui_for_testing &&
-      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableArcOOBEOptIn) &&
       profile_->IsNewProfile() &&
       !profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {
     ArcAuthNotification::Show(profile_);
   }
 }
 
 void ArcSessionManager::Shutdown() {
-  if (!g_disable_ui_for_testing)
-    ArcAuthNotification::Hide();
+  ArcAuthNotification::Hide();
 
   enable_requested_ = false;
   ShutdownSession();
   if (support_host_) {
     support_host_->Close();
     support_host_->RemoveObserver(this);
     support_host_.reset();
   }
   if (profile_) {
     sync_preferences::PrefServiceSyncable* pref_service_syncable =
@@ skipping 36 matching lines @@
       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.
-  if (!g_disable_ui_for_testing &&
-      profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {
+  if (profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled))
     ArcAuthNotification::Hide();
-  }
 
   if (is_play_store_enabled)
     RequestEnable();
   else
     RequestDisable();
 
   for (auto& observer : observer_list_)
     observer.OnArcPlayStoreEnabledChanged(is_play_store_enabled);
 }
 
@@ skipping 430 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