3 files changed, 2 insertions, 9 deletions
diff --git a/webkit/appcache/appcache_group.cc b/webkit/appcache/appcache_group.cc
index fd22563..8063b911 100644
--- a/webkit/appcache/appcache_group.cc
+++ b/webkit/appcache/appcache_group.cc
@@ -215,13 +215,7 @@ void AppCacheGroup::RunQueuedUpdates() {
 
 bool AppCacheGroup::FindObserver(UpdateObserver* find_me,
     const ObserverList<UpdateObserver>& observer_list) {
-  ObserverList<UpdateObserver>::Iterator it(observer_list);
-  UpdateObserver* obs;
-  while ((obs = it.GetNext()) != NULL) {
-    if (obs == find_me)
-      return true;
-  }
-  return false;
+  return observer_list.HasObserver(find_me);
 }
 
 void AppCacheGroup::ScheduleUpdateRestart(int delay_ms) {
diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc
index 5bafa6e..6068836d 100644
--- a/webkit/database/database_tracker.cc
+++ b/webkit/database/database_tracker.cc
@@ -40,7 +40,6 @@ DatabaseTracker::DatabaseTracker(const FilePath& profile_path)
 }
 
 DatabaseTracker::~DatabaseTracker() {
-  DCHECK(observers_.size() == 0);
   DCHECK(dbs_to_be_deleted_.empty());
   DCHECK(deletion_callbacks_.empty());
 }
diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h
index 139e5fe..785cd98 100644
--- a/webkit/database/database_tracker.h
+++ b/webkit/database/database_tracker.h
@@ -205,7 +205,7 @@ class DatabaseTracker
   scoped_ptr<DatabasesTable> databases_table_;
   scoped_ptr<QuotaTable> quota_table_;
   scoped_ptr<sql::MetaTable> meta_table_;
-  ObserverList<Observer> observers_;
+  ObserverList<Observer, true> observers_;
   std::map<string16, CachedOriginInfo> origins_info_map_;
   DatabaseConnections database_connections_;