Decouple lifetime of database thread and WebDatabase, chromium side.

content/child/web_database_observer_impl.cc

 // Copyright 2013 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 "content/child/web_database_observer_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "content/common/database_messages.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDatabase.h"
 #include "third_party/sqlite/sqlite3.h"
 
 using WebKit::WebDatabase;
+using WebKit::WebString;
 
 namespace content {
 namespace {
 
 const int kResultHistogramSize = 50;
 const int kCallsiteHistogramSize = 10;
 
 int DetermineHistogramResult(int websql_error, int sqlite_error) {
   // If we have a sqlite error, log it after trimming the extended bits.
   // There are 26 possible values, but we leave room for some new ones.
@@ skipping 56 matching lines @@
       origin_identifier, database_name,
       database.displayName(), database.estimatedSize()));
 }
 
 void WebDatabaseObserverImpl::databaseModified(
     const WebDatabase& database) {
   sender_->Send(new DatabaseHostMsg_Modified(
       database.securityOrigin().databaseIdentifier().utf8(), database.name()));
 }
 
+void WebDatabaseObserverImpl::databaseClosed(const WebString& origin_identifier,
+                                             const WebString& database_name) {
+  sender_->Send(new DatabaseHostMsg_Closed(
+      origin_identifier.utf8(), database_name));
+  open_connections_->RemoveOpenConnection(origin_identifier.utf8(),
+                                          database_name);
+}
+
 void WebDatabaseObserverImpl::databaseClosed(
     const WebDatabase& database) {
   std::string origin_identifier =
       database.securityOrigin().databaseIdentifier().utf8();
   string16 database_name = database.name();
   sender_->Send(new DatabaseHostMsg_Closed(
       origin_identifier, database_name));
   open_connections_->RemoveOpenConnection(origin_identifier, database_name);
 }
 
@@ skipping 61 matching lines @@
   // high frequency (per-sqlstatement).
   if (error == SQLITE_CORRUPT || error == SQLITE_NOTADB) {
     sender_->Send(new DatabaseHostMsg_HandleSqliteError(
         database.securityOrigin().databaseIdentifier().utf8(),
         database.name(),
         error));
   }
 }
 
 }  // namespace content