Fix Arc integration test.

chrome/browser/sync/test/integration/two_client_arc_package_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_arc_package_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_arc_package_sync_test.cc b/chrome/browser/sync/test/integration/two_client_arc_package_sync_test.cc
index ef5a1c8b50b6ad02513e6327358e45955d0f7d3e..358a316a574fa31170baaf60b20ad6badaa26386 100644
--- a/chrome/browser/sync/test/integration/two_client_arc_package_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_arc_package_sync_test.cc
@@ -6,6 +6,12 @@
 #include "chrome/browser/sync/test/integration/sync_arc_package_helper.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
+#include "components/arc/arc_util.h"
+
+namespace base {

[hidehiko, 2017/03/03 12:55:56]

Ditto.

[lgcheng, 2017/03/03 18:39:53]

Done.

+class CommandLine;
+}
 
 namespace arc {
 
@@ -37,8 +43,19 @@ class TwoClientArcPackageSyncTest : public SyncTest {
     return sync_helper_ != nullptr;
   }
 
+  void SetUpOnMainThread() override {
+    // This setting does not affect the profile created by InProcessBrowserTest.
+    // Only sync test profiles are affected.
+    ArcAppListPrefsFactory::SetFactoryForSyncTest();
+  }
+
+  // Sets up command line flags required for Arc sync tests.
+  void SetUpCommandLine(base::CommandLine* cl) override {
+    SetArcAvailableCommandLineForTesting(cl);
+    SyncTest::SetUpCommandLine(cl);
+  }
+
   void TearDownOnMainThread() override {
-    sync_helper_->CleanUp();
     sync_helper_ = nullptr;
     SyncTest::TearDownOnMainThread();
   }
@@ -85,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientArcPackageSyncTest,
   ASSERT_FALSE(AllProfilesHaveSameArcPackageDetails());
 
   ASSERT_TRUE(SetupSync());
-
+  ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameArcPackageDetails());
 }
 
@@ -108,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientArcPackageSyncTest,
   ASSERT_FALSE(AllProfilesHaveSameArcPackageDetails());
 
   ASSERT_TRUE(SetupSync());
-
+  ASSERT_TRUE(AwaitQuiescence());
   EXPECT_TRUE(AllProfilesHaveSameArcPackageDetails());
 }
 
@@ -128,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientArcPackageSyncTest,
   EXPECT_FALSE(AllProfilesHaveSameArcPackageDetails());
 
   ASSERT_TRUE(SetupSync());
-
+  ASSERT_TRUE(AwaitQuiescence());
   EXPECT_TRUE(AllProfilesHaveSameArcPackageDetails());
 }