chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.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: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.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 | « chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc ('k') | chrome/browser/extensions/chrome_content_browser_client_extensions_part.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

index 987729675941a5aa3c8367d0e6f5501b0a0b4b1c..c76d5dccb0a2741394d20ea4d60d34e8f780dd36 100644

--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

@@ -26,7 +26,7 @@ using ::testing::Eq;

using ::testing::Ne;

using ::testing::Property;

using ::testing::Return;

-using fileapi::FileSystemURL;

+using storage::FileSystemURL;

using sync_file_system::MockRemoteFileSyncService;

using sync_file_system::RemoteFileSyncService;

using sync_file_system::SyncFileSystemServiceFactory;

@@ -44,19 +44,21 @@ class SyncFileSystemApiTest : public ExtensionApiTest {

ExtensionApiTest::SetUpInProcessBrowserTestFixture();

real_minimum_preserved_space_ =

- quota::QuotaManager::kMinimumPreserveForSystem;

- quota::QuotaManager::kMinimumPreserveForSystem = 0;

+ storage::QuotaManager::kMinimumPreserveForSystem;

+ storage::QuotaManager::kMinimumPreserveForSystem = 0;

// TODO(calvinlo): Update test code after default quota is made const

// (http://crbug.com/155488).

- real_default_quota_ = quota::QuotaManager::kSyncableStorageDefaultHostQuota;

- quota::QuotaManager::kSyncableStorageDefaultHostQuota = 123456;

+ real_default_quota_ =

+ storage::QuotaManager::kSyncableStorageDefaultHostQuota;

+ storage::QuotaManager::kSyncableStorageDefaultHostQuota = 123456;

}

virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {

- quota::QuotaManager::kMinimumPreserveForSystem =

+ storage::QuotaManager::kMinimumPreserveForSystem =

real_minimum_preserved_space_;

- quota::QuotaManager::kSyncableStorageDefaultHostQuota = real_default_quota_;

+ storage::QuotaManager::kSyncableStorageDefaultHostQuota =

+ real_default_quota_;

ExtensionApiTest::TearDownInProcessBrowserTestFixture();

}