Sync: Support multiple setup UIs.

chrome/browser/supervised_user/supervised_user_service.h

Index: chrome/browser/supervised_user/supervised_user_service.h
diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
index 8e93e7576efa31e5e2a529401eb1d559d8a2536a..8a690ca384a10d9bf2579476c8bd31d27098aa18 100644
--- a/chrome/browser/supervised_user/supervised_user_service.h
+++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -60,6 +60,10 @@ namespace extensions {
 class ExtensionRegistry;
 }
 
+namespace sync_driver {
+class SyncSetupInProgressHandle;
+}
+
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
@@ -409,6 +413,9 @@ class SupervisedUserService : public KeyedService,
 
   base::ObserverList<SupervisedUserServiceObserver> observer_list_;
 
+  // Handle preventing Sync from running until configuration is complete.

[Lei Zhang, 2016/06/13 20:38:51]

Had a little trouble parsing this because Handle is a noun here and not a verb.
Maybe "A handle that prevents sync..." or just "Prevents sync..." ?

[tommycli, 2016/06/13 21:08:34]

Done.

+  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> setup_handle_;

[Lei Zhang, 2016/06/13 20:38:51]

Maybe a name like |sync_blocker_| better describes what it does?

[tommycli, 2016/06/13 21:08:34]

Done. I do like that variable name better.

Seems OK to me to leave the type name as it is, WDYT?

[Lei Zhang, 2016/06/13 21:19:31]

I wasn't suggesting changing SyncSetupInProgressHandle. I'm fine with the
renames in patch set 10.

+
   base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
 };