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 | |
64 // (http://crbug.com/160693) | 61 // (http://crbug.com/160693) |
65 #if !defined(OS_CHROMEOS) | 62 #if !defined(OS_CHROMEOS) |
66 | 63 |
67 // TODO(benwells): Re-enable this test. | 64 // TODO(calvinlo): Re-enable this test. |
| 65 // (http://crbug.com/162811) |
68 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) { | 66 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) { |
69 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system")) | 67 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system")) |
70 << message_; | 68 << message_; |
71 } | 69 } |
72 | 70 |
73 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) { | 71 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) { |
74 ASSERT_TRUE(RunExtensionTest("sync_file_system/get_usage_and_quota")) | 72 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_usage_and_quota")) |
75 << message_; | 73 << message_; |
76 } | 74 } |
77 | 75 |
78 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) { | 76 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) { |
79 EXPECT_CALL(*mock_remote_service(), | 77 EXPECT_CALL(*mock_remote_service(), |
80 RegisterOriginForTrackingChanges(_, _)).Times(1); | 78 RegisterOriginForTrackingChanges(_, _)).Times(1); |
81 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/request_file_system")) | 79 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/request_file_system")) |
82 << message_; | 80 << message_; |
83 } | 81 } |
84 | 82 |
85 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) { | 83 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) { |
86 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) | 84 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) |
87 << message_; | 85 << message_; |
88 } | 86 } |
89 | 87 |
90 #endif // !defined(OS_CHROMEOS) | 88 #endif // !defined(OS_CHROMEOS) |
91 | 89 |
92 #endif // !defined(OS_CHROMEOS) | |
93 | |
94 } // namespace chrome | 90 } // namespace chrome |
95 | 91 |
OLD | NEW |