summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 19:28:34 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 19:28:34 +0000
commit0fbd7033b5818725b4e956b93193f20f94fd698f (patch)
treeb8f8b1bfda547db52d90b7afaa79eab3989a2ddd /webkit
parent68228cdf78bbc4abf2dbef712693ec8ee59d1f64 (diff)
downloadchromium_src-0fbd7033b5818725b4e956b93193f20f94fd698f.zip
chromium_src-0fbd7033b5818725b4e956b93193f20f94fd698f.tar.gz
chromium_src-0fbd7033b5818725b4e956b93193f20f94fd698f.tar.bz2
Fixing AutoReset to be a template.
I've run into a couple of times this week when I needed one of these, for two different types besides bool. Time to fix the TODO. TEST=trybots FTW, and built locally. BUG=none Review URL: http://codereview.chromium.org/2394001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/appcache/appcache_database.cc2
-rw-r--r--webkit/tools/test_shell/simple_database_system.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/appcache/appcache_database.cc b/webkit/appcache/appcache_database.cc
index 42af3dbc..d7210c4 100644
--- a/webkit/appcache/appcache_database.cc
+++ b/webkit/appcache/appcache_database.cc
@@ -1122,7 +1122,7 @@ bool AppCacheDatabase::DeleteExistingAndCreateNewDatabase() {
if (is_recreating_)
return false;
- AutoReset auto_reset(&is_recreating_, true);
+ AutoReset<bool> auto_reset(&is_recreating_, true);
return LazyOpen(true);
}
diff --git a/webkit/tools/test_shell/simple_database_system.cc b/webkit/tools/test_shell/simple_database_system.cc
index 8f87dc2..a0645f5 100644
--- a/webkit/tools/test_shell/simple_database_system.cc
+++ b/webkit/tools/test_shell/simple_database_system.cc
@@ -159,7 +159,7 @@ void SimpleDatabaseSystem::databaseClosed(const WebKit::WebDatabase& database) {
void SimpleDatabaseSystem::ClearAllDatabases() {
// Wait for all databases to be closed.
if (!database_connections_.IsEmpty()) {
- AutoReset waiting_for_dbs_auto_reset(&waiting_for_dbs_to_close_, true);
+ AutoReset<bool> waiting_for_dbs_auto_reset(&waiting_for_dbs_to_close_, true);
MessageLoop::ScopedNestableTaskAllower nestable(MessageLoop::current());
MessageLoop::current()->Run();
}