content/browser/indexed_db/indexed_db_unittest.cc - Issue 16879013: Use chromium logic for database identifier<->origin conversions

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 16879013: Use chromium logic for database identifier<->origin conversions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove webkit/base/origin_url_conversions Created 7 years, 6 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/renderer_host/database_message_filter.cc » ('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 4c5a971d2e211fc1f510c9916ea50237cd530654..e5a8b35215308ca4ff4487a85f17ca232f0a08b0 100644

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

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

@@ -11,10 +11,10 @@

#include "content/public/common/url_constants.h"

#include "content/public/test/test_browser_context.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include "webkit/base/origin_url_conversions.h"

#include "webkit/browser/quota/mock_special_storage_policy.h"

#include "webkit/browser/quota/quota_manager.h"

#include "webkit/browser/quota/special_storage_policy.h"

+#include "webkit/common/database/database_identifier.h"

namespace content {

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

idb_context->set_data_path_for_testing(temp_dir.path());

normal_path = idb_context->GetFilePathForTesting(

- webkit_base::GetOriginIdentifierFromURL(kNormalOrigin));

+ webkit_database::GetIdentifierFromOrigin(kNormalOrigin));

session_only_path = idb_context->GetFilePathForTesting(

- webkit_base::GetOriginIdentifierFromURL(kSessionOnlyOrigin));

+ webkit_database::GetIdentifierFromOrigin(kSessionOnlyOrigin));

ASSERT_TRUE(file_util::CreateDirectory(normal_path));

ASSERT_TRUE(file_util::CreateDirectory(session_only_path));

message_loop_.RunUntilIdle();

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

idb_context->SetForceKeepSessionState();

normal_path = idb_context->GetFilePathForTesting(

- webkit_base::GetOriginIdentifierFromURL(kNormalOrigin));

+ webkit_database::GetIdentifierFromOrigin(kNormalOrigin));

session_only_path = idb_context->GetFilePathForTesting(

- webkit_base::GetOriginIdentifierFromURL(kSessionOnlyOrigin));

+ webkit_database::GetIdentifierFromOrigin(kSessionOnlyOrigin));

ASSERT_TRUE(file_util::CreateDirectory(normal_path));

ASSERT_TRUE(file_util::CreateDirectory(session_only_path));

message_loop_.RunUntilIdle();

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

idb_context->set_data_path_for_testing(temp_dir.path());

test_path = idb_context->GetFilePathForTesting(

- webkit_base::GetOriginIdentifierFromURL(kTestOrigin));

+ webkit_database::GetIdentifierFromOrigin(kTestOrigin));

ASSERT_TRUE(file_util::CreateDirectory(test_path));

const bool kExpectForceClose = true;