Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

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

Issue 12731006: Enable browser tests for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/browser/extensions/event_names.h" 9 #include "chrome/browser/extensions/event_names.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 base::MessageLoopProxy::current()->PostTask( 94 base::MessageLoopProxy::current()->PostTask(
95 FROM_HERE, base::Bind(arg0, 95 FROM_HERE, base::Bind(arg0,
96 sync_file_system::SYNC_STATUS_OK, 96 sync_file_system::SYNC_STATUS_OK,
97 mock_url)); 97 mock_url));
98 mock_remote_service->NotifyFileStatusChanged( 98 mock_remote_service->NotifyFileStatusChanged(
99 mock_url, sync_direction, sync_file_status, sync_action_taken); 99 mock_url, sync_direction, sync_file_status, sync_action_taken);
100 } 100 }
101 101
102 } // namespace 102 } // namespace
103 103
104 // TODO(calvinlo): Add Chrome OS support for syncable file system
105 // (http://crbug.com/160693)
106 #if !defined(OS_CHROMEOS)
107
108 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DeleteFileSystem) { 104 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DeleteFileSystem) {
109 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system")) 105 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system"))
110 << message_; 106 << message_;
111 } 107 }
112 108
113 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatus) { 109 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatus) {
114 EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true)); 110 EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true));
115 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status")) 111 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status"))
116 << message_; 112 << message_;
117 } 113 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) { 167 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) {
172 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) 168 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage"))
173 << message_; 169 << message_;
174 } 170 }
175 171
176 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, ConflictResolutionPolicy) { 172 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, ConflictResolutionPolicy) {
177 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy")) 173 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy"))
178 << message_; 174 << message_;
179 } 175 }
180 176
181 #endif // !defined(OS_CHROMEOS)
182
183 } // namespace chrome 177 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698