chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc - Issue 11362166: Merge 166715 - Revert r165772: Keep browser process alive while there are platform apps with backgr…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

Issue 11362166: Merge 166715 - Revert r165772: Keep browser process alive while there are platform apps with backgr… (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1320/src/

Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/api/socket/socket_apitest.cc ('k') | chrome/browser/extensions/api/system_info_cpu/system_info_cpu_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/file_util.h"	5 #include "base/file_util.h"

6 #include "base/path_service.h"	6 #include "base/path_service.h"

7 #include "chrome/browser/extensions/extension_apitest.h"	7 #include "chrome/browser/extensions/extension_apitest.h"

8 #include "chrome/common/chrome_version_info.h"	8 #include "chrome/common/chrome_version_info.h"

9 #include "chrome/common/extensions/features/feature.h"	9 #include "chrome/common/extensions/features/feature.h"

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

(...skipping 22 matching lines...) Expand all Loading...
33 quota::QuotaManager::kSyncableStorageDefaultHostQuota = real_default_quota_;	33 quota::QuotaManager::kSyncableStorageDefaultHostQuota = real_default_quota_;

34 }	34 }

35	35

36 private:	36 private:

37 extensions::Feature::ScopedCurrentChannel current_channel_;	37 extensions::Feature::ScopedCurrentChannel current_channel_;

38 int64 real_default_quota_;	38 int64 real_default_quota_;

39 };	39 };

40	40

41 } // namespace	41 } // namespace

42	42

43 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DeleteFileSystem) {	43 // TODO(benwells): Re-enable this test.

	44 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) {

44 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system"))	45 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system"))

45 << message_;	46 << message_;

46 }	47 }

47	48

48 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) {	49 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) {

49 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_usage_and_quota"))	50 ASSERT_TRUE(RunExtensionTest("sync_file_system/get_usage_and_quota"))

50 << message_;	51 << message_;

51 }	52 }

52	53

53 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) {	54 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) {

54 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/request_file_system"))	55 ASSERT_TRUE(RunExtensionTest("sync_file_system/request_file_system"))

55 << message_;	56 << message_;

56 }	57 }

57	58

58 } // namespace chrome	59 } // namespace chrome

OLD	NEW