Chromium Code Reviews| Index: chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc |
| diff --git a/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc b/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc |
| index 7f948b2d5c8292ec9b60ed8dbeb7cf0fc7017db5..05a8ffc41258e6ec7ec5e670f819955db4e1e953 100644 |
| --- a/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc |
| +++ b/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc |
| @@ -6,7 +6,13 @@ |
| #include "chrome/browser/sync/test/integration/sync_arc_package_helper.h" |
| #include "chrome/browser/sync/test/integration/sync_test.h" |
| #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" |
| +#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h" |
| #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h" |
| +#include "components/arc/arc_util.h" |
| + |
| +namespace base { |
|
hidehiko
2017/03/03 12:55:56
nit: looks unnecessary? Argument type of overrding
lgcheng
2017/03/03 18:39:53
Done.
|
| +class CommandLine; |
| +} |
| namespace arc { |
| @@ -36,12 +42,23 @@ class SingleClientArcPackageSyncTest : 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(); |
| + } |
| + |
| void TearDownOnMainThread() override { |
| - sync_helper_->CleanUp(); |
| sync_helper_ = nullptr; |
| SyncTest::TearDownOnMainThread(); |
| } |
| + // Sets up command line flags required for Arc sync tests. |
| + void SetUpCommandLine(base::CommandLine* cl) override { |
| + SetArcAvailableCommandLineForTesting(cl); |
| + SyncTest::SetUpCommandLine(cl); |
| + } |
| + |
| SyncArcPackageHelper* sync_helper() { return sync_helper_; } |
| private: |