Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Side by Side Diff: content/browser/indexed_db/indexed_db_database_unittest.cc

Issue 377953002: IndexedDB: Cleanup of r281546 following Blink roll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/indexed_db/indexed_db_database.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/indexed_db/indexed_db_database.h" 5 #include "content/browser/indexed_db/indexed_db_database.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 kFakeChildProcessId, 201 kFakeChildProcessId,
202 transaction_id1, 202 transaction_id1,
203 IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION); 203 IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);
204 db->OpenConnection(connection); 204 db->OpenConnection(connection);
205 205
206 EXPECT_FALSE(backing_store->HasOneRef()); // local and db 206 EXPECT_FALSE(backing_store->HasOneRef()); // local and db
207 207
208 scoped_refptr<MockDeleteCallbacks> request2(new MockDeleteCallbacks()); 208 scoped_refptr<MockDeleteCallbacks> request2(new MockDeleteCallbacks());
209 db->DeleteDatabase(request2); 209 db->DeleteDatabase(request2);
210 210
211 // TODO(jsbell): Remove once Blink is updated. crbug.com/100123
212 #if WEB_INDEXEDDB_FIRE_BLOCKED_ONLY_IF_IGNORED
213 EXPECT_FALSE(request2->blocked_called()); 211 EXPECT_FALSE(request2->blocked_called());
214 db->VersionChangeIgnored(); 212 db->VersionChangeIgnored();
215 #endif
216 EXPECT_TRUE(request2->blocked_called()); 213 EXPECT_TRUE(request2->blocked_called());
217 214
218 EXPECT_FALSE(backing_store->HasOneRef()); // local and db 215 EXPECT_FALSE(backing_store->HasOneRef()); // local and db
219 216
220 db->Close(request1->connection(), true /* forced */); 217 db->Close(request1->connection(), true /* forced */);
221 218
222 EXPECT_FALSE(db->backing_store()); 219 EXPECT_FALSE(db->backing_store());
223 EXPECT_TRUE(backing_store->HasOneRef()); // local 220 EXPECT_TRUE(backing_store->HasOneRef()); // local
224 EXPECT_TRUE(request2->success_called()); 221 EXPECT_TRUE(request2->success_called());
225 } 222 }
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 EXPECT_EQ(1ULL, db_->metadata().object_stores.size()); 409 EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
413 410
414 // This will execute the Put then Delete. 411 // This will execute the Put then Delete.
415 RunPostedTasks(); 412 RunPostedTasks();
416 EXPECT_EQ(0ULL, db_->metadata().object_stores.size()); 413 EXPECT_EQ(0ULL, db_->metadata().object_stores.size());
417 414
418 transaction_->Commit(); // Cleans up the object hierarchy. 415 transaction_->Commit(); // Cleans up the object hierarchy.
419 } 416 }
420 417
421 } // namespace content 418 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/indexed_db/indexed_db_database.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698