Remove initial_opt_in_ field.

chrome/browser/chromeos/arc/arc_auth_service.cc

 // Copyright 2015 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_auth_service.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
@@ skipping 382 matching lines @@
   return account_info_notifier_ != nullptr;
 }
 
 void ArcAuthService::PrepareContextForAuthCodeRequest() {
   // Requesting auth code on demand happens in following cases:
   // 1. To handle account password revoke.
   // 2. In case Arc is activated in OOBE flow.
   // 3. For any other state on Android side that leads device appears in
   // non-signed state.
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DCHECK(IsAuthCodeRequest());
-  DCHECK_EQ(state_, State::ACTIVE);
-  initial_opt_in_ = false;
+  if (state_ == State::ACTIVE) {
+    DCHECK(IsAuthCodeRequest());

[Luis Héctor Chávez, 2016/11/04 22:37:54]

How about DCHECK(state_ != State::ACTIVE || IsAuthCodeRequest()); ?
Alternatively, elide the braces.

[hidehiko, 2016/11/04 22:42:42]

Done.

+  }
   context_->PrepareContext();
 }
 
 void ArcAuthService::OnSignInComplete() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK_EQ(state_, State::ACTIVE);
 
   if (!sign_in_time_.is_null()) {
     arc_sign_in_timer_.Stop();
     UpdateProvisioningTiming(base::Time::Now() - sign_in_time_, true,
@@ skipping 210 matching lines @@
   CHECK(extension && extensions::util::IsAppLaunchable(
                          ArcSupportHost::kHostAppId, profile_));
   OpenApplication(CreateAppLaunchParamsUserContainer(
       profile_, extension, WindowOpenDisposition::NEW_WINDOW,
       extensions::SOURCE_CHROME_INTERNAL));
 }
 
 void ArcAuthService::OnContextReady() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  DCHECK(!initial_opt_in_);
-
   // TODO(hidehiko): The check is not necessary if this is a part of re-auth
   // flow. Remove this.
   android_management_checker_.reset(new ArcAndroidManagementChecker(
       profile_, context_->token_service(), context_->account_id(),
       false /* retry_on_error */));
   android_management_checker_->StartCheck(
       base::Bind(&ArcAuthService::OnAndroidManagementChecked,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 41 matching lines @@
     return;
   }
 
   if (state_ == State::ACTIVE)
     return;
   CloseUI();
   auth_code_.clear();
 
   if (!profile_->GetPrefs()->GetBoolean(prefs::kArcSignedIn)) {
     // Need pre-fetch auth code and show OptIn UI if needed.
-    initial_opt_in_ = true;
     StartUI();
   } else {
     // Ready to start Arc, but check Android management in parallel.
     StartArc();
     // Note: Because the callback may be called in synchronous way (i.e. called
     // on the same stack), StartCheck() needs to be called *after* StartArc().
     // Otherwise, DisableArc() which may be called in
     // OnBackgroundAndroidManagementChecked() could be ignored.
     if (!g_disable_ui_for_testing ||
         g_enable_check_android_management_for_testing) {
@@ skipping 114 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Update UMA only if error (with or without feedback) is currently shown.
   if (ui_page_ == UIPage::ERROR) {
     UpdateOptInActionUMA(OptInActionType::RETRY);
   } else if (ui_page_ == UIPage::ERROR_WITH_FEEDBACK) {
     UpdateOptInActionUMA(OptInActionType::RETRY);
     ShutdownBridge();
   }
 
-  // TODO(khmel): Use PrepareContextForAuthCodeRequest for this case.
-  initial_opt_in_ = false;
-  StartUI();
+  DCHECK(!arc_bridge_service()->stopped());

[Luis Héctor Chávez, 2016/11/04 22:37:54]

DCHECK(arc_bridge_service()->stopped());

[hidehiko, 2016/11/04 22:42:42]

Ugrrr... Good catch. Fixed.

+  SetState(State::FETCHING_CODE);
+  PrepareContextForAuthCodeRequest();
 }
 
 void ArcAuthService::CancelAuthCode() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (state_ == State::NOT_INITIALIZED) {
     NOTREACHED();
     return;
   }
 
@@ skipping 58 matching lines @@
 
   if (!arc_bridge_service()->stopped()) {
     // If the user attempts to re-enable ARC while the bridge is still running
     // the user should not be able to continue until the bridge has stopped.
     ShowUI(UIPage::ERROR, l10n_util::GetStringUTF16(
                               IDS_ARC_SIGN_IN_SERVICE_UNAVAILABLE_ERROR));
     return;
   }
 
   SetState(State::FETCHING_CODE);
-
-  if (initial_opt_in_) {
-    initial_opt_in_ = false;
-    ShowUI(UIPage::TERMS, base::string16());
-  } else {
-    context_->PrepareContext();
-  }
+  ShowUI(UIPage::TERMS, base::string16());
 }
 
 void ArcAuthService::OnPrepareContextFailed() {
   DCHECK_EQ(state_, State::FETCHING_CODE);
 
   ShutdownBridgeAndShowUI(
       UIPage::ERROR,
       l10n_util::GetStringUTF16(IDS_ARC_SERVER_COMMUNICATION_ERROR));
   UpdateOptInCancelUMA(OptInCancelReason::NETWORK_ERROR);
 }
@@ skipping 96 matching lines @@
       return os << "FETCHING_CODE";
     case ArcAuthService::State::ACTIVE:
       return os << "ACTIVE";
     default:
       NOTREACHED();
       return os;
   }
 }
 
 }  // namespace arc