Remove initial_opt_in_ field.

chrome/browser/chromeos/arc/arc_auth_service.cc

Index: chrome/browser/chromeos/arc/arc_auth_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc
index aadfbef78caef4670e34642aef3d7d97535122e0..eaaae1c4d3b53a60225535ab8afc35f13d5822d0 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_service.cc
@@ -400,9 +400,9 @@ void ArcAuthService::PrepareContextForAuthCodeRequest() {
   // 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();
 }
 
@@ -633,8 +633,6 @@ void ArcAuthService::ShowUI(UIPage page, const base::string16& status) {
 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(
@@ -696,7 +694,6 @@ void ArcAuthService::OnOptInPreferenceChanged() {
 
   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.
@@ -831,9 +828,9 @@ void ArcAuthService::StartLso() {
     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() {
@@ -912,13 +909,7 @@ void ArcAuthService::StartUI() {
   }
 
   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() {