chrome/browser/sync_file_system/local/canned_syncable_file_system.cc - Issue 259083002: Move mock_special_storage_policy from webkit/ to content/public/test/

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: chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

Issue 259083002: Move mock_special_storage_policy from webkit/ to content/public/test/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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 | « chrome/browser/net/sqlite_server_bound_cert_store_unittest.cc ('k') | content/browser/appcache/chrome_appcache_service_unittest.cc » ('j') | content/browser/database_tracker_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

index 2c7a56bd39c8517731ceaf58e90288884122b89f..4da0015eca2b1d9b17ad77bd2fd6b8d1e3bf5bd2 100644

--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

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

#include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"

#include "chrome/browser/sync_file_system/syncable_file_system_util.h"

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

+#include "content/public/test/mock_special_storage_policy.h"

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

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

#include "webkit/browser/fileapi/external_mount_points.h"

@@ -29,7 +30,6 @@

#include "webkit/browser/fileapi/file_system_context.h"

#include "webkit/browser/fileapi/file_system_operation_context.h"

#include "webkit/browser/fileapi/file_system_operation_runner.h"

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

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

#include "webkit/common/blob/shareable_file_reference.h"

@@ -227,7 +227,7 @@ void CannedSyncableFileSystem::SetUp(QuotaMode quota_mode) {

ASSERT_TRUE(data_dir_.CreateUniqueTempDir());

scoped_refptr<quota::SpecialStoragePolicy> storage_policy =

- new quota::MockSpecialStoragePolicy();

+ new content::MockSpecialStoragePolicy();

if (quota_mode == QUOTA_ENABLED) {

quota_manager_ = new QuotaManager(false /* is_incognito */,