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

chrome/browser/views/options/content_page_view.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/views/options/content_page_view.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 127 matching lines @@
               IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS,
               IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES)));
       return;
     } else {
       sync_service_->ShowLoginDialog(GetWindow()->GetNativeWindow());
       ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS);
     }
   } else if (sender == sync_customize_button_) {
     // sync_customize_button_ should be invisible if sync is not yet set up.
     DCHECK(sync_service_->HasSyncSetupCompleted());
-    sync_service_->ShowChooseDataTypes(GetWindow()->GetNativeWindow());
+    sync_service_->ShowConfigure(GetWindow()->GetNativeWindow());
   }
 }
 
 void ContentPageView::LinkActivated(views::Link* source, int event_flags) {
   if (source == themes_gallery_link_) {
     UserMetricsRecordAction(UserMetricsAction("Options_ThemesGallery"),
                             profile()->GetPrefs());
     BrowserList::GetLastActive()->OpenThemeGalleryTabAndActivate();
     return;
   }
@@ skipping 328 matching lines @@
   sync_action_link_->SetEnabled(!managed);
 
   if (status_has_error) {
     sync_status_label_->set_background(CreateErrorBackground());
     sync_action_link_->set_background(CreateErrorBackground());
   } else {
     sync_status_label_->set_background(NULL);
     sync_action_link_->set_background(NULL);
   }
 }