Fixed crash on TranslateManager with multiple profiles.

chrome/browser/translate/translate_manager.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/translate/translate_manager.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/memory/singleton.h"
@@ skipping 308 matching lines @@
       // Only add translate infobar if it doesn't exist; if it already exists,
       // just update the state, the actual infobar would have received the same
       //  notification and update the visual display accordingly.
       TabContents* tab = Source<TabContents>(source).ptr();
       PageTranslatedDetails* page_translated_details =
           Details<PageTranslatedDetails>(details).ptr();
       PageTranslated(tab, page_translated_details);
       break;
     }
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
-      Profile* profile = Source<Profile>(source).ptr();
+      PrefService* pref_service = Source<Profile>(source).ptr()->GetPrefs();
       notification_registrar_.Remove(this,
                                      chrome::NOTIFICATION_PROFILE_DESTROYED,
                                      source);
-      size_t count = accept_languages_.erase(profile->GetPrefs());
+      size_t count = accept_languages_.erase(pref_service);
       // We should know about this profile since we are listening for
       // notifications on it.
-      DCHECK(count > 0);
-      pref_change_registrar_.Remove(prefs::kAcceptLanguages, this);
+      DCHECK(count == 1u);
+      PrefChangeRegistrar* pref_change_registrar =
+          pref_change_registrars_[pref_service];
+      count = pref_change_registrars_.erase(pref_service);
+      DCHECK(count == 1u);
+      delete pref_change_registrar;
       break;
     }
     case chrome::NOTIFICATION_PREF_CHANGED: {
       DCHECK(*Details<std::string>(details).ptr() == prefs::kAcceptLanguages);
       PrefService* prefs = Source<PrefService>(source).ptr();
       InitAcceptLanguages(prefs);
       break;
     }
     default:
       NOTREACHED();
@@ skipping 88 matching lines @@
                               NotificationService::AllSources());
 }
 
 void TranslateManager::InitiateTranslation(TabContents* tab,
                                            const std::string& page_lang) {
   Profile* profile = Profile::FromBrowserContext(tab->browser_context());
   PrefService* prefs = profile->GetOriginalProfile()->GetPrefs();
   if (!prefs->GetBoolean(prefs::kEnableTranslate))
     return;
 
-  pref_change_registrar_.Init(prefs);
-
   // Allow disabling of translate from the command line to assist with
   // automated browser testing.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableTranslate))
     return;
 
   NavigationEntry* entry = tab->controller().GetActiveEntry();
   if (!entry) {
     // This can happen for popups created with window.open("").
     return;
   }
@@ skipping 197 matching lines @@
   PrefService* pref_service = profile->GetPrefs();
   PrefServiceLanguagesMap::const_iterator iter =
       accept_languages_.find(pref_service);
   if (iter == accept_languages_.end()) {
     InitAcceptLanguages(pref_service);
     // Listen for this profile going away, in which case we would need to clear
     // the accepted languages for the profile.
     notification_registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                                 Source<Profile>(profile));
     // Also start listening for changes in the accept languages.
-    pref_change_registrar_.Add(prefs::kAcceptLanguages, this);
+    DCHECK(pref_change_registrars_.find(pref_service) ==
+           pref_change_registrars_.end());
+    PrefChangeRegistrar* pref_change_registrar = new PrefChangeRegistrar;
+    pref_change_registrar->Init(pref_service);
+    pref_change_registrar->Add(prefs::kAcceptLanguages, this);
+    pref_change_registrars_[pref_service] = pref_change_registrar;
 
     iter = accept_languages_.find(pref_service);
   }
 
   return iter->second.count(language) != 0;
 }
 
 void TranslateManager::InitAcceptLanguages(PrefService* prefs) {
   // We have been asked for this profile, build the languages.
   std::string accept_langs_str = prefs->GetString(prefs::kAcceptLanguages);
@@ skipping 115 matching lines @@
     return NULL;
 
   for (size_t i = 0; i < wrapper->infobar_count(); ++i) {
     TranslateInfoBarDelegate* delegate =
         wrapper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
     if (delegate)
       return delegate;
   }
   return NULL;
 }