Fix some problems with the ENTER_PASSPHRASE state in sync setup....

chrome/browser/gtk/options/content_page_gtk.cc

 // Copyright (c) 2010 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/gtk/options/content_page_gtk.h"
 
 #include <string>
 
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
@@ skipping 582 matching lines @@
   } else {
     sync_service_->ShowLoginDialog(NULL);
     ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS);
   }
 }
 
 void ContentPageGtk::OnSyncCustomizeButtonClicked(GtkWidget* widget) {
   // sync_customize_button_ should be invisible if sync is not yet set up.
   DCHECK(sync_service_ && !sync_service_->IsManaged() &&
          sync_service_->HasSyncSetupCompleted());
-  sync_service_->ShowChooseDataTypes(NULL);
+  sync_service_->ShowConfigure(NULL);
 }
 
 void ContentPageGtk::OnSyncActionLinkClicked(GtkWidget* widget) {
   DCHECK(sync_service_ && !sync_service_->IsManaged());
-  sync_service_->ShowChooseDataTypes(NULL);
+  sync_service_->ShowConfigure(NULL);
 }
 
 void ContentPageGtk::OnStopSyncDialogResponse(GtkWidget* widget, int response) {
   if (response == GTK_RESPONSE_ACCEPT) {
     sync_service_->DisableForUser();
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
   }
   gtk_widget_destroy(widget);
 }
 
 void ContentPageGtk::OnPrivacyDashboardLinkClicked(GtkWidget* widget) {
   BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
 }