Sync: Support multiple setup UIs.

chrome/browser/sync/profile_sync_service_android.cc

 // Copyright 2013 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/sync/profile_sync_service_android.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 168 matching lines @@
     const JavaParamRef<jobject>&) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return sync_service_->IsBackendInitialized();
 }
 
 void ProfileSyncServiceAndroid::SetSetupInProgress(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jboolean in_progress) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  sync_service_->SetSetupInProgress(in_progress);
+  if (in_progress)

[maxbogue, 2016/06/09 20:04:11]

Curly braces please

[tommycli, 2016/06/10 00:04:15]

Done.

+    setup_handle_ = sync_service_->GetSetupInProgressHandle();
+  else
+    setup_handle_.reset();
 }
 
 jboolean ProfileSyncServiceAndroid::IsFirstSetupComplete(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return sync_service_->IsFirstSetupComplete();
 }
 
 void ProfileSyncServiceAndroid::SetFirstSetupComplete(
@@ skipping 301 matching lines @@
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ProfileSyncServiceAndroid* profile_sync_service_android =
       new ProfileSyncServiceAndroid(env, obj);
   if (profile_sync_service_android->Init()) {
     return reinterpret_cast<intptr_t>(profile_sync_service_android);
   } else {
     delete profile_sync_service_android;
     return 0;
   }
 }