Split ArcAuthNotification UI control flag from ArcSessionManager.

chrome/browser/chromeos/arc/arc_session_manager.cc

Index: chrome/browser/chromeos/arc/arc_session_manager.cc
diff --git a/chrome/browser/chromeos/arc/arc_session_manager.cc b/chrome/browser/chromeos/arc/arc_session_manager.cc
index ca0b41b7921a1c7ebec62a34b3657141f32bd982..0959bb2836deda93aa460c13f949d0bce76a0324 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -143,6 +143,9 @@ bool ArcSessionManager::IsOobeOptInActive() {
 // 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
@@ -469,8 +472,7 @@ void ArcSessionManager::OnIsSyncingChanged() {
     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)) {
@@ -479,8 +481,7 @@ void ArcSessionManager::OnIsSyncingChanged() {
 }
 
 void ArcSessionManager::Shutdown() {
-  if (!g_disable_ui_for_testing)
-    ArcAuthNotification::Hide();
+  ArcAuthNotification::Hide();
 
   enable_requested_ = false;
   ShutdownSession();
@@ -537,10 +538,8 @@ void ArcSessionManager::OnOptInPreferenceChanged() {
 
   // 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();