Unrevert "[Sync] Split GetPreferredTypes into GetActiveType...""

chrome/browser/password_manager/password_generation_manager.cc

 // Copyright 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/password_manager/password_generation_manager.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 112 matching lines @@
   bool saving_passwords_enabled =
       PasswordManager::FromWebContents(web_contents())->IsSavingEnabled();
 
   bool preference_checked = profile->GetPrefs()->GetBoolean(
       prefs::kPasswordGenerationEnabled);
 
   bool password_sync_enabled = false;
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   if (sync_service) {
-    syncer::ModelTypeSet sync_set = sync_service->GetPreferredDataTypes();
+    syncer::ModelTypeSet sync_set = sync_service->GetActiveDataTypes();
     password_sync_enabled = (sync_service->HasSyncSetupCompleted() &&
                              sync_set.Has(syncer::PASSWORDS));
   }
 
   bool new_enabled = (password_sync_enabled &&
                       saving_passwords_enabled &&
                       preference_checked);
 
   if (new_enabled != enabled_ || new_renderer) {
     enabled_ = new_enabled;
@@ skipping 14 matching lines @@
 #if defined(OS_ANDROID)
   NOTIMPLEMENTED();
 #else
   password_generator_.reset(new autofill::PasswordGenerator(max_length));
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   browser->window()->ShowPasswordGenerationBubble(bounds,
                                                   form,
                                                   password_generator_.get());
 #endif  // #if defined(OS_ANDROID)
 }