Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / test / integration / cross_platform_sync_test.cc

diff --git a/src/chrome/browser/sync/test/integration/cross_platform_sync_test.cc b/src/chrome/browser/sync/test/integration/cross_platform_sync_test.cc
index c4ee00f..6b7ab9e 100644 (file)
--- a/src/chrome/browser/sync/test/integration/cross_platform_sync_test.cc
+++ b/src/chrome/browser/sync/test/integration/cross_platform_sync_test.cc
@@ -3,12 +3,14 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
-#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
+#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using bookmarks_helper::AddURL;
 using bookmarks_helper::ModelMatchesVerifier;
+using sync_integration_test_util::AwaitCommitActivityCompletion;
 
 // These tests are run on the Chrome on iOS buildbots as part of cross-platform
 // sync integration tests, and are not meant to be run on the chromium
@@ -26,6 +28,6 @@ class CrossPlatformSyncTest : public SyncTest {
 IN_PROC_BROWSER_TEST_F(CrossPlatformSyncTest, DISABLED_AddBookmark) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AddURL(0, L"Google", GURL("http://www.google.co.uk")));
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 }