content/browser/indexed_db/indexed_db_unittest.cc - Issue 671873004: Migrates legacy packaged app data when it's upgraded to a platform app

Unified Diff: content/browser/indexed_db/indexed_db_unittest.cc

Issue 671873004: Migrates legacy packaged app data when it's upgraded to a platform app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Empty patch trying to unwedge try server Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/extension_service.cc ('K') | « content/browser/indexed_db/indexed_db_quota_client_unittest.cc ('k') | content/public/browser/indexed_db_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/indexed_db/indexed_db_unittest.cc

diff --git a/content/browser/indexed_db/indexed_db_unittest.cc b/content/browser/indexed_db/indexed_db_unittest.cc

index ddb1fdc66bd281bb8c8f8314b9c63823e2e37428..1b9de5b59fe8b57fb9048c0fb3517bede1dcb4e2 100644

--- a/content/browser/indexed_db/indexed_db_unittest.cc

+++ b/content/browser/indexed_db/indexed_db_unittest.cc

@@ -68,10 +68,8 @@ TEST_F(IndexedDBTest, ClearSessionOnlyDatabases) {

NULL,

task_runner_.get());

- normal_path = idb_context->GetFilePathForTesting(

- storage::GetIdentifierFromOrigin(kNormalOrigin));

- session_only_path = idb_context->GetFilePathForTesting(

- storage::GetIdentifierFromOrigin(kSessionOnlyOrigin));

+ normal_path = idb_context->GetFilePath(kNormalOrigin);

+ session_only_path = idb_context->GetFilePath(kSessionOnlyOrigin);

ASSERT_TRUE(base::CreateDirectory(normal_path));

ASSERT_TRUE(base::CreateDirectory(session_only_path));

FlushIndexedDBTaskRunner();

@@ -105,10 +103,8 @@ TEST_F(IndexedDBTest, SetForceKeepSessionState) {

// Save session state. This should bypass the destruction-time deletion.

idb_context->SetForceKeepSessionState();

- normal_path = idb_context->GetFilePathForTesting(

- storage::GetIdentifierFromOrigin(kNormalOrigin));

- session_only_path = idb_context->GetFilePathForTesting(

- storage::GetIdentifierFromOrigin(kSessionOnlyOrigin));

+ normal_path = idb_context->GetFilePath(kNormalOrigin);

+ session_only_path = idb_context->GetFilePath(kSessionOnlyOrigin);

ASSERT_TRUE(base::CreateDirectory(normal_path));

ASSERT_TRUE(base::CreateDirectory(session_only_path));

message_loop_.RunUntilIdle();

@@ -181,8 +177,7 @@ TEST_F(IndexedDBTest, ForceCloseOpenDatabasesOnDelete) {

IndexedDBFactory* factory = idb_context->GetIDBFactory();

- test_path = idb_context->GetFilePathForTesting(

- storage::GetIdentifierFromOrigin(kTestOrigin));

+ test_path = idb_context->GetFilePath(kTestOrigin);

IndexedDBPendingConnection open_connection(open_callbacks,

open_db_callbacks,

@@ -231,8 +226,7 @@ TEST_F(IndexedDBTest, DeleteFailsIfDirectoryLocked) {

scoped_refptr<IndexedDBContextImpl> idb_context = new IndexedDBContextImpl(

temp_dir.path(), special_storage_policy_.get(), NULL, task_runner_.get());

- base::FilePath test_path = idb_context->GetFilePathForTesting(

- storage::GetIdentifierFromOrigin(kTestOrigin));

+ base::FilePath test_path = idb_context->GetFilePath(kTestOrigin);

ASSERT_TRUE(base::CreateDirectory(test_path));

scoped_ptr<LevelDBLock> lock =