arc: Don't show OOBE OptIn in case ARC is forced to start.

Bug: b/69813150
Test: Manually on device. No OOBE OptIn page and ARC starts
Change-Id: I915d9d6a426e42b26e2f74decb76eadba3f32081
Reviewed-on: https://chromium-review.googlesource.com/792632
Commit-Queue: Yury Khmel <khmel@google.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520723}

chrome/browser/chromeos/arc/arc_session_manager.cc

@@ -584,15 +584,15 @@ bool ArcSessionManager::RequestEnableImpl() {
 
   PrefService* const prefs = profile_->GetPrefs();
 
-  // If it is marked that sign in has been successfully done, if ARC has been
-  // set up to always start, then directly start ARC.
+  // If it is marked that sign in has been successfully done or if Play Store is
+  // not available, then directly start ARC with skipping Play Store ToS.
   // For Kiosk mode, skip ToS because it is very likely that near the device
   // there will be no one who is eligible to accept them.
   // If opt-in verification is disabled, skip negotiation, too. This is for
   // testing purpose.
-  const bool start_arc_directly = prefs->GetBoolean(prefs::kArcSignedIn) ||
-                                  ShouldArcAlwaysStart() || IsArcKioskMode() ||
-                                  IsArcOptInVerificationDisabled();
+  const bool start_arc_directly =
+      prefs->GetBoolean(prefs::kArcSignedIn) || !arc::IsPlayStoreAvailable() ||
+      IsArcKioskMode() || IsArcOptInVerificationDisabled();
 
   // When ARC is blocked because of filesystem compatibility, do not proceed
   // to starting ARC nor follow further state transitions.

chrome/browser/chromeos/arc/arc_session_manager_unittest.cc

@@ -591,7 +591,7 @@ class ArcSessionManagerArcAlwaysStartTest : public ArcSessionManagerTest {
   ArcSessionManagerArcAlwaysStartTest() = default;
 
   void SetUp() override {
-    SetArcAlwaysStartForTesting(true);
+    SetArcAlwaysStartForTesting(false);
     ArcSessionManagerTest::SetUp();
   }
 

chrome/browser/chromeos/arc/arc_util.cc

@@ -406,6 +406,10 @@ bool IsActiveDirectoryUserForProfile(const Profile* profile) {
 }
 
 bool IsArcOobeOptInActive() {
+  // No OOBE is expected in case Play Store is not available.
+  if (!IsPlayStoreAvailable())
+    return false;
+
   // Check if Chrome OS OOBE or OPA OptIn flow is currently showing.
   // TODO(b/65861628): Rename the method since it is no longer accurate.
   // Redesign the OptIn flow since there is no longer reason to have two
@@ -436,6 +440,7 @@ bool IsArcOobeOptInActive() {
           chromeos::switches::kEnableArcOOBEOptIn)) {
     return false;
   }
+
   return true;
 }
 

chrome/browser/chromeos/login/wizard_controller.cc

@@ -881,7 +881,7 @@ void WizardController::OnVoiceInteractionValuePropSkipped() {
 void WizardController::OnVoiceInteractionValuePropAccepted() {
   const Profile* profile = ProfileManager::GetActiveUserProfile();
   if (is_in_session_oobe_ && !arc::IsArcPlayStoreEnabledForProfile(profile) &&
-      !arc::ShouldArcAlwaysStart()) {
+      arc::IsPlayStoreAvailable()) {
     ShowArcTermsOfServiceScreen();
     return;
   }
@@ -1620,6 +1620,13 @@ bool WizardController::ShouldShowArcTerms() const {
     VLOG(1) << "Skip ARC Terms of Service screen because ARC is disabled.";
     return false;
   }
+
+  if (!arc::IsPlayStoreAvailable()) {
+    VLOG(1) << "Skip ARC Terms of Service screen because Play Store is not "
+               "available on the device.";
+    return false;
+  }
+
   if (arc::IsActiveDirectoryUserForProfile(profile)) {
     VLOG(1) << "Skip ARC Terms of Service screen because it does not apply to "
                "Active Directory users.";