From 84aebedeaa91c3fadf523260c12afa136420c7d3 Mon Sep 17 00:00:00 2001
From: "willchan@chromium.org"
 <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 25 Feb 2010 03:09:41 +0000
Subject: Reland 39942 - Switch NetworkChangeNotifier implementations to use
 ObserverList. Fixed build problem with database_tracker.(cc|h). BUG=36590

Review URL: http://codereview.chromium.org/660039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39983 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/database/database_tracker.cc | 1 -
 webkit/database/database_tracker.h  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'webkit/database')

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_;
 
-- 
cgit v1.1