Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
index ef04e015ba74d4318e4a28ed5e36910cb7c1429d..8098c32893e912f4abee42533243508940f806ce 100644 |
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
@@ -12,14 +12,16 @@ |
#include "chrome/browser/sync_file_system/sync_file_system_service.h" |
#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/extensions/features/feature.h" |
+#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "webkit/fileapi/syncable/sync_status_code.h" |
#include "webkit/quota/quota_manager.h" |
+using ::testing::_; |
+using ::testing::Return; |
using sync_file_system::MockRemoteFileSyncService; |
using sync_file_system::RemoteFileSyncService; |
using sync_file_system::SyncFileSystemServiceFactory; |
-using ::testing::_; |
namespace chrome { |
@@ -77,6 +79,12 @@ IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DeleteFileSystem) { |
<< message_; |
} |
+IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileSyncStatus) { |
+ EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true)); |
+ ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_sync_status")) |
+ << message_; |
+} |
+ |
IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) { |
ASSERT_TRUE(RunExtensionTest("sync_file_system/get_usage_and_quota")) |
<< message_; |