ProfileManager: Remove CHECKs.

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2012 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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 509 matching lines @@
       // Ignore any browsers closing from now on.
       shutdown_started_ = true;
       break;
     }
     case chrome::NOTIFICATION_BROWSER_OPENED: {
       Browser* browser = content::Source<Browser>(source).ptr();
       DCHECK(browser);
       Profile* profile = browser->profile();
       DCHECK(profile);
       if (!profile->IsOffTheRecord() && ++browser_counts_[profile] == 1) {
-        CHECK(std::find(active_profiles_.begin(), active_profiles_.end(),
-                        profile) == active_profiles_.end());
         active_profiles_.push_back(profile);
         update_active_profiles = true;
       }
       break;
     }
     case chrome::NOTIFICATION_BROWSER_CLOSED: {
       Browser* browser = content::Source<Browser>(source).ptr();
       DCHECK(browser);
       Profile* profile = browser->profile();
       DCHECK(profile);
       if (!profile->IsOffTheRecord() && --browser_counts_[profile] == 0) {
-        CHECK(std::find(active_profiles_.begin(), active_profiles_.end(),
-                        profile) != active_profiles_.end());
-        active_profiles_.erase(
-            std::remove(active_profiles_.begin(), active_profiles_.end(),
-                        profile),
-            active_profiles_.end());
-        CHECK(std::find(active_profiles_.begin(), active_profiles_.end(),
-                        profile) == active_profiles_.end());
+        active_profiles_.erase(std::find(active_profiles_.begin(),
+                                         active_profiles_.end(), profile));
         update_active_profiles = true;
       }
       break;
     }
     default: {
       NOTREACHED();
       break;
     }
   }
   if (update_active_profiles) {
     PrefService* local_state = g_browser_process->local_state();
     DCHECK(local_state);
     ListPrefUpdate update(local_state, prefs::kProfilesLastActive);
     ListValue* profile_list = update.Get();
 
     profile_list->Clear();
 
-    // Check that the same profile doesn't occur twice in last_opened_profiles.
-    {
-      std::set<Profile*> active_profiles_set;
-      for (std::vector<Profile*>::const_iterator it = active_profiles_.begin();
-           it != active_profiles_.end(); ++it) {
-        CHECK(active_profiles_set.find(*it) ==
-              active_profiles_set.end());
-        active_profiles_set.insert(*it);
-      }
-    }
-    // Used for checking that the string representations of the profiles differ.
+    // crbug.com/120112 -> several non-incognito profiles might have the same
+    // GetPath().BaseName(). In that case, we cannot restore both
+    // profiles. Include each base name only once in the last active profile
+    // list.
     std::set<std::string> profile_paths;
-
     std::vector<Profile*>::const_iterator it;
     for (it = active_profiles_.begin(); it != active_profiles_.end(); ++it) {
       std::string profile_path = (*it)->GetPath().BaseName().MaybeAsASCII();
-      CHECK(profile_paths.find(profile_path) ==
-            profile_paths.end());
-      profile_paths.insert(profile_path);
-      profile_list->Append(
-          new StringValue((*it)->GetPath().BaseName().MaybeAsASCII()));
+      if (profile_paths.find(profile_path) == profile_paths.end()) {
+        profile_paths.insert(profile_path);
+        profile_list->Append(new StringValue(profile_path));
+      }
     }
   }
 }
 
 void ProfileManager::SetWillImport() {
   will_import_ = true;
 }
 
 void ProfileManager::OnImportFinished(Profile* profile) {
   will_import_ = false;
@@ skipping 363 matching lines @@
     AddProfileToCache(profile);
   }
 }
 
 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks,
                                   Profile* profile,
                                   Profile::CreateStatus status) {
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run(profile, status);
 }