More WebSQLDatabase and QuotaManager integration.

webkit/database/database_connections_unittest.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 "base/message_loop.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/database/database_connections.h"
@@ skipping 63 matching lines @@
   another.AddConnection(kOriginId, kName2);
 
   std::vector<std::pair<string16, string16> > closed_dbs;
   connections.RemoveConnections(another, &closed_dbs);
   EXPECT_EQ(1u, closed_dbs.size());
   EXPECT_EQ(kOriginId, closed_dbs[0].first);
   EXPECT_EQ(kName2, closed_dbs[0].second);
   EXPECT_FALSE(connections.IsDatabaseOpened(kOriginId, kName2));
   EXPECT_TRUE(connections.IsDatabaseOpened(kOriginId, kName));
   EXPECT_EQ(kSize, connections.GetOpenDatabaseSize(kOriginId, kName));
-
+  another.RemoveAllConnections();
   connections.RemoveAllConnections();
   EXPECT_TRUE(connections.IsEmpty());
 
-  another.RemoveAllConnections();
+  // Ensure the return value properly indicates the initial
+  // addition and final removal.
+  EXPECT_TRUE(connections.AddConnection(kOriginId, kName));
+  EXPECT_FALSE(connections.AddConnection(kOriginId, kName));
+  EXPECT_FALSE(connections.AddConnection(kOriginId, kName));
+  EXPECT_FALSE(connections.RemoveConnection(kOriginId, kName));
+  EXPECT_FALSE(connections.RemoveConnection(kOriginId, kName));
+  EXPECT_TRUE(connections.RemoveConnection(kOriginId, kName));
 }
 
 TEST(DatabaseConnectionsTest, DatabaseConnectionsWrapperTest) {
   const string16 kOriginId(ASCIIToUTF16("origin_id"));
   const string16 kName(ASCIIToUTF16("database_name"));
 
   scoped_refptr<DatabaseConnectionsWrapper> obj(
       new DatabaseConnectionsWrapper);
   EXPECT_FALSE(obj->HasOpenConnections());
   obj->AddOpenConnection(kOriginId, kName);
@@ skipping 26 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE,
       NewRunnableFunction(ScheduleRemoveConnectionTask,
                           &thread, kOriginId, kName,
                           obj, &did_task_execute));
   obj->WaitForAllDatabasesToClose();  // should return after the task executes
   EXPECT_TRUE(did_task_execute);
   EXPECT_FALSE(obj->HasOpenConnections());
 }
 
 }  // namespace webkit_database