[Merge M58] arc: Reactivate OptIn flow on clicking Play Store.

chrome/browser/chromeos/arc/arc_util.cc

 // Copyright 2017 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_util.h"
 
 #include "base/logging.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/arc/arc_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 
@@ skipping 89 matching lines @@
   if (!IsArcAllowedForProfile(profile)) {
     LOG(DFATAL) << "ARC is not allowed for profile";
     return false;
   }
   return profile->GetPrefs()->IsManagedPreference(prefs::kArcEnabled);
 }
 
 void SetArcPlayStoreEnabledForProfile(Profile* profile, bool enabled) {
   DCHECK(IsArcAllowedForProfile(profile));
   if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile)) {
-    VLOG(1) << "Do nothing, since the Google-Play-Store-enabled pref is "
-            << "managed.";
+    VLOG(1) << "Google-Play-Store-enabled pref is managed. Request to "
+            << (enabled ? "enable" : "disable") << " Play Store is not stored";
+    // Need update ARC session manager manually for managed case in order to
+    // keep its state up to date, otherwise it may stuck with enabling
+    // request.
+    // TODO (khmel): Consider finding the better way handling this.
+    ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
+    // |arc_session_manager| can be nullptr in unit_tests.
+    if (!arc_session_manager)
+      return;
+    if (enabled)
+      arc_session_manager->RequestEnable();
+    else
+      arc_session_manager->RequestDisable();
     return;
   }
   profile->GetPrefs()->SetBoolean(prefs::kArcEnabled, enabled);
 }
 
 }  // namespace arc