Index: webkit/dom_storage/session_storage_database_unittest.cc |
diff --git a/webkit/dom_storage/session_storage_database_unittest.cc b/webkit/dom_storage/session_storage_database_unittest.cc |
index 150b9a456b8f03be42f9804e03e9fc31cc16ad67..d5725ebc1f88b74879a10e7a463b28ca98033aeb 100644 |
--- a/webkit/dom_storage/session_storage_database_unittest.cc |
+++ b/webkit/dom_storage/session_storage_database_unittest.cc |
@@ -465,7 +465,7 @@ TEST_F(SessionStorageDatabaseTest, ShallowCopy) { |
data2[kKey3] = kValue1; |
ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2)); |
// Make a shallow copy. |
- EXPECT_TRUE(db_->CloneNamespace(1, 5)); |
+ db_->CloneNamespace(1, 5); |
// Now both namespaces should have the same data. |
CheckDatabaseConsistency(); |
CheckAreaData(1, kOrigin1, data1); |
@@ -484,7 +484,7 @@ TEST_F(SessionStorageDatabaseTest, WriteIntoShallowCopy) { |
data1[kKey1] = kValue1; |
data1[kKey2] = kValue2; |
ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1)); |
- EXPECT_TRUE(db_->CloneNamespace(1, 5)); |
+ db_->CloneNamespace(1, 5); |
// Write data into a shallow copy. |
ValuesMap changes; |
@@ -520,11 +520,11 @@ TEST_F(SessionStorageDatabaseTest, ManyShallowCopies) { |
ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2)); |
// Make a two shallow copies. |
- EXPECT_TRUE(db_->CloneNamespace(1, 5)); |
- EXPECT_TRUE(db_->CloneNamespace(1, 6)); |
+ db_->CloneNamespace(1, 5); |
+ db_->CloneNamespace(1, 6); |
// Make a shallow copy of a shallow copy. |
- EXPECT_TRUE(db_->CloneNamespace(6, 7)); |
+ db_->CloneNamespace(6, 7); |
// Now all namespaces should have the same data. |
CheckDatabaseConsistency(); |
@@ -555,10 +555,10 @@ TEST_F(SessionStorageDatabaseTest, DisassociateShallowCopy) { |
data1[kKey1] = kValue1; |
data1[kKey2] = kValue2; |
ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1)); |
- EXPECT_TRUE(db_->CloneNamespace(1, 5)); |
+ db_->CloneNamespace(1, 5); |
// Disassoaciate the shallow copy. |
- EXPECT_TRUE(db_->DeleteArea(5, kOrigin1)); |
+ db_->DeleteArea(5, kOrigin1); |
CheckDatabaseConsistency(); |
// Now new data can be written to that map. |
@@ -606,7 +606,7 @@ TEST_F(SessionStorageDatabaseTest, DeleteNamespaceWithShallowCopy) { |
ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2)); |
// Make a shallow copy and delete the original namespace. |
- EXPECT_TRUE(db_->CloneNamespace(1, 5));; |
+ db_->CloneNamespace(1, 5); |
EXPECT_TRUE(db_->DeleteNamespace(1)); |
// The original namespace has no data. |
@@ -630,7 +630,7 @@ TEST_F(SessionStorageDatabaseTest, DeleteArea) { |
data2[kKey3] = kValue1; |
ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2)); |
- EXPECT_TRUE(db_->DeleteArea(1, kOrigin2)); |
+ db_->DeleteArea(1, kOrigin2); |
CheckDatabaseConsistency(); |
// The data for the non-deleted origin persists. |
CheckAreaData(1, kOrigin1, data1); |
@@ -651,8 +651,8 @@ TEST_F(SessionStorageDatabaseTest, DeleteAreaWithShallowCopy) { |
ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2)); |
// Make a shallow copy and delete an origin from the original namespace. |
- EXPECT_TRUE(db_->CloneNamespace(1, 5)); |
- EXPECT_TRUE(db_->DeleteArea(1, kOrigin1)); |
+ db_->CloneNamespace(1, 5); |
+ db_->DeleteArea(1, kOrigin1); |
CheckDatabaseConsistency(); |
// The original namespace has data for only the non-deleted origin. |
@@ -744,7 +744,7 @@ TEST_F(SessionStorageDatabaseTest, NamespaceOffsetCloneNamespace) { |
EXPECT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data2)); |
// Make a shallow copy of the newly created namespace. |
- EXPECT_TRUE(db_->CloneNamespace(1, 20)); |
+ db_->CloneNamespace(1, 20); |
// The clone contains values from the newly created namespace. |
CheckAreaData(20, kOrigin1, data2); |
@@ -778,7 +778,7 @@ TEST_F(SessionStorageDatabaseTest, NamespaceOffsetWriteIntoShallowCopy) { |
EXPECT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data2)); |
// Make a shallow copy of the newly created namespace. |
- EXPECT_TRUE(db_->CloneNamespace(1, 20)); |
+ db_->CloneNamespace(1, 20); |
// Now the values can be altered and a deep copy will be made. |
ValuesMap data3; |
@@ -816,7 +816,7 @@ TEST_F(SessionStorageDatabaseTest, NamespaceOffsetDeleteArea) { |
EXPECT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data2)); |
// Delete kOrigin1 from the newly created namespace. |
- EXPECT_TRUE(db_->DeleteArea(1, kOrigin1)); |
+ db_->DeleteArea(1, kOrigin1); |
// Namespace 1 is empty. |
CheckAreaData(1, kOrigin1, ValuesMap()); |