Green Tree Tactical Force: Revert skrul's bad commits (probably a git-cl bug).

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 7acb034100a90cd9743e78ee2e80922b9a7c1bff..9615124089ebe321612d96bf7913300efcecfe75 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -175,7 +175,10 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // progress, the sync system is already authenticated, or some error
   // occurred preventing the action. We make it the duty of ProfileSyncService
   // to open the dialog to easily ensure only one is ever showing.
-  bool SetupInProgress() const;
+  bool SetupInProgress() const {
+    return !HasSyncSetupCompleted() &&
+        (WizardIsVisible() || bootstrap_sync_authentication_);
+  }
   bool WizardIsVisible() const {
     return wizard_.IsVisible();
   }