content/browser/indexed_db/indexed_db_unittest.cc - Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix chromeos build Created 6 years, 4 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

« no previous file with comments | « content/browser/indexed_db/indexed_db_quota_client_unittest.cc ('k') | content/browser/loader/redirect_to_file_resource_handler.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 d60de84a6124dadcfdcf7bd97d357d7699eee550..3971d5acf3d14cd2e463296f1aacab37e46f2da9 100644

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

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

@@ -66,9 +66,9 @@ TEST_F(IndexedDBTest, ClearSessionOnlyDatabases) {

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

normal_path = idb_context->GetFilePathForTesting(

- webkit_database::GetIdentifierFromOrigin(kNormalOrigin));

+ storage::GetIdentifierFromOrigin(kNormalOrigin));

session_only_path = idb_context->GetFilePathForTesting(

- webkit_database::GetIdentifierFromOrigin(kSessionOnlyOrigin));

+ storage::GetIdentifierFromOrigin(kSessionOnlyOrigin));

ASSERT_TRUE(base::CreateDirectory(normal_path));

ASSERT_TRUE(base::CreateDirectory(session_only_path));

FlushIndexedDBTaskRunner();

@@ -100,9 +100,9 @@ TEST_F(IndexedDBTest, SetForceKeepSessionState) {

idb_context->SetForceKeepSessionState();

normal_path = idb_context->GetFilePathForTesting(

- webkit_database::GetIdentifierFromOrigin(kNormalOrigin));

+ storage::GetIdentifierFromOrigin(kNormalOrigin));

session_only_path = idb_context->GetFilePathForTesting(

- webkit_database::GetIdentifierFromOrigin(kSessionOnlyOrigin));

+ storage::GetIdentifierFromOrigin(kSessionOnlyOrigin));

ASSERT_TRUE(base::CreateDirectory(normal_path));

ASSERT_TRUE(base::CreateDirectory(session_only_path));

message_loop_.RunUntilIdle();

@@ -173,7 +173,7 @@ TEST_F(IndexedDBTest, ForceCloseOpenDatabasesOnDelete) {

IndexedDBFactory* factory = idb_context->GetIDBFactory();

test_path = idb_context->GetFilePathForTesting(

- webkit_database::GetIdentifierFromOrigin(kTestOrigin));

+ storage::GetIdentifierFromOrigin(kTestOrigin));

IndexedDBPendingConnection open_connection(open_callbacks,

open_db_callbacks,

@@ -223,7 +223,7 @@ TEST_F(IndexedDBTest, DeleteFailsIfDirectoryLocked) {

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

base::FilePath test_path = idb_context->GetFilePathForTesting(

- webkit_database::GetIdentifierFromOrigin(kTestOrigin));

+ storage::GetIdentifierFromOrigin(kTestOrigin));

ASSERT_TRUE(base::CreateDirectory(test_path));

scoped_ptr<LevelDBLock> lock =