Don't skip ARC ToS due to policies if ArcEnabled is not managed

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 645 matching lines @@
   profile_->GetPrefs()->SetBoolean(prefs::kArcTermsAccepted, true);
   StartAndroidManagementCheck();
 }
 
 bool ArcSessionManager::IsArcTermsOfServiceNegotiationNeeded() const {
   DCHECK(profile_);
 
   // Skip to show UI asking users to set up ARC OptIn preferences, if all of
   // them are managed by the admin policy. Note that the ToS agreement is anyway
   // not shown in the case of the managed ARC.
-  if (AreArcAllOptInPreferencesManagedForProfile(profile_)) {
+  if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_) &&
+      AreArcAllOptInPreferencesManagedForProfile(profile_)) {
     VLOG(1) << "All opt-in preferences are under managed. "
             << "Skip ARC Terms of Service negotiation.";
     return false;
   }
 
   // If it is marked that the Terms of service is accepted already,
   // just skip the negotiation with user, and start Android management
   // check directly.
   // This happens, e.g., when a user accepted the Terms of service on Opt-in
   // flow, but logged out before ARC sign in procedure was done. Then, logs
@@ skipping 296 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