content/browser/in_process_webkit/indexed_db_unittest.cc - Issue 10919307: Move IndexedDBContext into the StoragePartition and ensure isolation.

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/in_process_webkit/indexed_db_unittest.cc

Issue 10919307: Move IndexedDBContext into the StoragePartition and ensure isolation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove useless include Created 8 years, 3 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/in_process_webkit/indexed_db_quota_client_unittest.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/in_process_webkit/indexed_db_unittest.cc

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

index 05d74c54f7ea06e33fe8f5bfee8efc82e71b5f68..89b3e92afd61e561b3135d382a662b87fae29a3f 100644

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

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

@@ -6,6 +6,7 @@

#include "base/scoped_temp_dir.h"

#include "content/browser/browser_thread_impl.h"

#include "content/browser/in_process_webkit/indexed_db_context_impl.h"

+#include "content/public/browser/storage_partition.h"

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

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

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

@@ -60,7 +61,8 @@ TEST_F(IndexedDBTest, ClearSessionOnlyDatabases) {

// With the levelDB backend, these are directories.

IndexedDBContextImpl* idb_context =

static_cast<IndexedDBContextImpl*>(

- BrowserContext::GetIndexedDBContext(&browser_context));

+ BrowserContext::GetDefaultStoragePartition(&browser_context)->

+ GetIndexedDBContext());

// Override the storage policy with our own.

idb_context->special_storage_policy_ = special_storage_policy;

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

// With the levelDB backend, these are directories.

IndexedDBContextImpl* idb_context =

static_cast<IndexedDBContextImpl*>(

- BrowserContext::GetIndexedDBContext(&browser_context));

+ BrowserContext::GetDefaultStoragePartition(&browser_context)->

+ GetIndexedDBContext());

// Override the storage policy with our own.

idb_context->special_storage_policy_ = special_storage_policy;

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

IndexedDBContextImpl* idb_context =

static_cast<IndexedDBContextImpl*>(

- BrowserContext::GetIndexedDBContext(&browser_context));

+ BrowserContext::GetDefaultStoragePartition(&browser_context)->

+ GetIndexedDBContext());

idb_context->quota_manager_proxy_ = NULL;

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