Ensure sync footer visibility is always set correctly.

chrome/browser/ui/webui/welcome_handler_android.cc

 // Copyright (c) 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/ui/webui/welcome_handler_android.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 24 matching lines @@
       base::Unretained(this)));
 
   // Register for callbacks
   sync_service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       Profile::FromWebUI(web_ui()));
   if (sync_service_)
     observer_manager_.Add(sync_service_);
 }
 
 void WelcomeHandler::HandleUpdateSyncFooterVisibility(const ListValue* args) {
-  OnStateChanged();
+  UpdateSyncFooterVisibility(true);
 }
 
 void WelcomeHandler::HandleShowSyncSettings(const ListValue* args) {
   TabAndroid::FromWebContents(web_ui()->GetWebContents())->ShowSyncSettings();
 }
 
 void WelcomeHandler::HandleShowTermsOfService(const ListValue* args) {
   TabAndroid::FromWebContents(web_ui()->GetWebContents())->ShowTermsOfService();
 }
 
 void WelcomeHandler::OnStateChanged() {
+  UpdateSyncFooterVisibility(false);
+}
+
+void WelcomeHandler::UpdateSyncFooterVisibility(bool forced) {
   bool is_sync_enabled =
       sync_service_ && sync_service_->IsSyncEnabledAndLoggedIn();
 
-  if (is_sync_footer_visible_ != is_sync_enabled) {
+  if (forced || is_sync_footer_visible_ != is_sync_enabled) {
     is_sync_footer_visible_ = is_sync_enabled;
     web_ui()->CallJavascriptFunction("welcome.setSyncFooterVisible",
                                      base::FundamentalValue(is_sync_enabled));
   }
 }