Fix the following issue in app notify login flow:

chrome/browser/extensions/app_notify_channel_ui.cc

 // Copyright (c) 2011 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/extensions/app_notify_channel_ui.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 69 matching lines @@
 
 void AppNotifyChannelUIImpl::InfoBar::InfoBarDismissed() {
   Cancel();
 }
 
 
 AppNotifyChannelUIImpl::AppNotifyChannelUIImpl(Browser* browser,
                                                TabContentsWrapper* wrapper,
                                                const std::string& app_name)
     : browser_(browser), wrapper_(wrapper), app_name_(app_name),
-      delegate_(NULL), observing_sync_(false), got_first_sync_callback_(false) {
+      delegate_(NULL), observing_sync_(false), wizard_shown_to_user_(false) {
 }
 
 AppNotifyChannelUIImpl::~AppNotifyChannelUIImpl() {
   // We should have either not started observing sync, or already called
   // StopObservingSync by this point.
   CHECK(!observing_sync_);
 }
 
 void AppNotifyChannelUIImpl::PromptSyncSetup(
     AppNotifyChannelUI::Delegate* delegate) {
@@ skipping 17 matching lines @@
         browser_->profile()->GetOriginalProfile()->GetProfileSyncService();
     service->ShowLoginDialog();
   } else {
     delegate_->OnSyncSetupResult(false);
   }
 }
 
 void AppNotifyChannelUIImpl::OnStateChanged() {
   ProfileSyncService* sync_service =
       browser_->profile()->GetProfileSyncService();
-  bool finished = got_first_sync_callback_ && !sync_service->SetupInProgress();
-  got_first_sync_callback_ = true;
+  bool wizard_visible = sync_service->WizardIsVisible();
+  // ProfileSyncService raises OnStateChanged many times. Even multiple
+  // times before the wizard actually becomes visible for the first time.
+  // So we have to wait for the wizard to become visible once and then we
+  // wait for it to get dismissed.
+  bool finished = wizard_shown_to_user_ && !wizard_visible;
+  if (wizard_visible)
+    wizard_shown_to_user_ = true;
 
   if (finished) {
     StopObservingSync();
     delegate_->OnSyncSetupResult(sync_service->HasSyncSetupCompleted());
   }
 }
 
 void AppNotifyChannelUIImpl::StartObservingSync() {
   CHECK(!observing_sync_);
   observing_sync_ = true;
   browser_->profile()->GetProfileSyncService()->AddObserver(this);
 }
 
 void AppNotifyChannelUIImpl::StopObservingSync() {
   CHECK(observing_sync_);
   observing_sync_ = false;
   browser_->profile()->GetProfileSyncService()->RemoveObserver(this);
 }