base: Fix the TODO in ListValue::Remove().

chrome/browser/content_settings/content_settings_notification_provider.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/content_settings/content_settings_notification_provider.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
@@ skipping 263 matching lines @@
     ListPrefUpdate update_denied_sites(
         prefs, prefs::kDesktopNotificationDeniedOrigins);
     ListValue* allowed_sites = update_allowed_sites.Get();
     ListValue* denied_sites = update_denied_sites.Get();
     // |value| is passed to the preferences list, or deleted.
     StringValue* value = new StringValue(origin.spec());
 
     // Remove from one list and add to the other.
     if (is_allowed) {
       // Remove from the denied list.
-      if (denied_sites->Remove(*value) != -1)
+      if (denied_sites->Remove(*value, NULL))
         denied_changed = true;
 
       // Add to the allowed list.
       if (allowed_sites->AppendIfNotPresent(value))
         allowed_changed = true;
     } else {
       // Remove from the allowed list.
-      if (allowed_sites->Remove(*value) != -1)
+      if (allowed_sites->Remove(*value, NULL))
         allowed_changed = true;
 
       // Add to the denied list.
       if (denied_sites->AppendIfNotPresent(value))
         denied_changed = true;
     }
   }
 
   // Persist the pref if anthing changed, but only send updates for the
   // list that changed.
@@ skipping 26 matching lines @@
   if (profile_->IsOffTheRecord())
     return;
 
   // Since this isn't called often, let the normal observer behavior update the
   // cache in this case.
   PrefService* prefs = profile_->GetPrefs();
   {
     ListPrefUpdate update(prefs, prefs::kDesktopNotificationAllowedOrigins);
     ListValue* allowed_sites = update.Get();
     StringValue value(origin.spec());
-    int removed_index = allowed_sites->Remove(value);
-    DCHECK_NE(-1, removed_index) << origin << " was not allowed";
+    bool removed = allowed_sites->Remove(value, NULL);
+    DCHECK_NE(false, removed) << origin << " was not allowed";
   }
   prefs->ScheduleSavePersistentPrefs();
 }
 
 void NotificationProvider::ResetBlockedOrigin(const GURL& origin) {
   if (profile_->IsOffTheRecord())
     return;
 
   // Since this isn't called often, let the normal observer behavior update the
   // cache in this case.
   PrefService* prefs = profile_->GetPrefs();
   {
     ListPrefUpdate update(prefs, prefs::kDesktopNotificationDeniedOrigins);
     ListValue* denied_sites = update.Get();
     StringValue value(origin.spec());
-    int removed_index = denied_sites->Remove(value);
-    DCHECK_NE(-1, removed_index) << origin << " was not blocked";
+    bool removed = denied_sites->Remove(value, NULL);
+    DCHECK_NE(false, removed) << origin << " was not blocked";
   }
   prefs->ScheduleSavePersistentPrefs();
 }
 
 void NotificationProvider::ResetAllOrigins() {
   PrefService* prefs = profile_->GetPrefs();
   prefs->ClearPref(prefs::kDesktopNotificationAllowedOrigins);
   prefs->ClearPref(prefs::kDesktopNotificationDeniedOrigins);
 }
 
 }  // namespace content_settings