chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc - Issue 11299326: Revert 170660

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

Issue 11299326: Revert 170660 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years 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_indicator/system_indicator_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/browser/sync_file_system/local_change_processor.h"	8 #include "chrome/browser/sync_file_system/local_change_processor.h"

9 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h"	9 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h"

10 #include "chrome/browser/sync_file_system/sync_file_system_service.h"	10 #include "chrome/browser/sync_file_system/sync_file_system_service.h"

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51	51

52 private:	52 private:

53 extensions::Feature::ScopedCurrentChannel current_channel_;	53 extensions::Feature::ScopedCurrentChannel current_channel_;

54 ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_;	54 ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_;

55 int64 real_default_quota_;	55 int64 real_default_quota_;

56 };	56 };

57	57

58 } // namespace	58 } // namespace

59	59

60 // TODO(calvinlo): Add Chrome OS support for syncable file system	60 // TODO(calvinlo): Add Chrome OS support for syncable file system

	61 #if !defined(OS_CHROMEOS)

	62

	63 // TODO(calvinlo): Add Chrome OS support for syncable file system

61 // (http://crbug.com/160693)	64 // (http://crbug.com/160693)

62 #if !defined(OS_CHROMEOS)	65 #if !defined(OS_CHROMEOS)

63	66

64 // TODO(calvinlo): Re-enable this test.	67 // TODO(benwells): Re-enable this test.

65 // (http://crbug.com/162811)

66 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) {	68 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) {

67 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system"))	69 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system"))

68 << message_;	70 << message_;

69 }	71 }

70	72

71 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) {	73 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) {

72 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_usage_and_quota"))	74 ASSERT_TRUE(RunExtensionTest("sync_file_system/get_usage_and_quota"))

73 << message_;	75 << message_;

74 }	76 }

75	77

76 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) {	78 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) {

77 EXPECT_CALL(*mock_remote_service(),	79 EXPECT_CALL(*mock_remote_service(),

78 RegisterOriginForTrackingChanges(_, _)).Times(1);	80 RegisterOriginForTrackingChanges(_, _)).Times(1);

79 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/request_file_system"))	81 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/request_file_system"))

80 << message_;	82 << message_;

81 }	83 }

82	84

83 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) {	85 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) {

84 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage"))	86 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage"))

85 << message_;	87 << message_;

86 }	88 }

87	89

88 #endif // !defined(OS_CHROMEOS)	90 #endif // !defined(OS_CHROMEOS)

89	91

	92 #endif // !defined(OS_CHROMEOS)

	93

90 } // namespace chrome	94 } // namespace chrome

91	95

OLD	NEW