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 "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "chrome/browser/extensions/event_names.h" | 8 #include "chrome/browser/extensions/event_names.h" |
9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
10 #include "chrome/browser/sync_file_system/local_change_processor.h" | 10 #include "chrome/browser/sync_file_system/local_change_processor.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 base::MessageLoopProxy::current()->PostTask( | 68 base::MessageLoopProxy::current()->PostTask( |
69 FROM_HERE, base::Bind(arg1, fileapi::SYNC_STATUS_OK)); | 69 FROM_HERE, base::Bind(arg1, fileapi::SYNC_STATUS_OK)); |
70 } | 70 } |
71 | 71 |
72 ACTION_P2(UpdateRemoteChangeQueue, origin, mock_remote_service) { | 72 ACTION_P2(UpdateRemoteChangeQueue, origin, mock_remote_service) { |
73 *origin = arg0; | 73 *origin = arg0; |
74 mock_remote_service->NotifyRemoteChangeQueueUpdated(1); | 74 mock_remote_service->NotifyRemoteChangeQueueUpdated(1); |
75 } | 75 } |
76 | 76 |
77 ACTION_P2(ReturnWithFakeFileAddedStatus, origin, mock_remote_service) { | 77 ACTION_P2(ReturnWithFakeFileAddedStatus, origin, mock_remote_service) { |
78 fileapi::FileSystemURL mock_url(*origin, | 78 fileapi::FileSystemURL mock_url = |
79 fileapi::kFileSystemTypeTest, | 79 fileapi::FileSystemURL::CreateForTest(*origin, |
80 FilePath(FILE_PATH_LITERAL("foo"))); | 80 fileapi::kFileSystemTypeTest, |
| 81 FilePath(FILE_PATH_LITERAL("foo"))); |
81 mock_remote_service->NotifyRemoteChangeQueueUpdated(0); | 82 mock_remote_service->NotifyRemoteChangeQueueUpdated(0); |
82 base::MessageLoopProxy::current()->PostTask( | 83 base::MessageLoopProxy::current()->PostTask( |
83 FROM_HERE, base::Bind(arg1, | 84 FROM_HERE, base::Bind(arg1, |
84 fileapi::SYNC_STATUS_OK, | 85 fileapi::SYNC_STATUS_OK, |
85 mock_url, | 86 mock_url, |
86 fileapi::SYNC_OPERATION_ADDED)); | 87 fileapi::SYNC_OPERATION_ADDED)); |
87 } | 88 } |
88 | 89 |
89 } // namespace | 90 } // namespace |
90 | 91 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 137 |
137 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) { | 138 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) { |
138 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) | 139 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage")) |
139 << message_; | 140 << message_; |
140 } | 141 } |
141 | 142 |
142 #endif // !defined(OS_CHROMEOS) | 143 #endif // !defined(OS_CHROMEOS) |
143 | 144 |
144 } // namespace chrome | 145 } // namespace chrome |
145 | 146 |
OLD | NEW |