summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 21:17:32 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 21:17:32 +0000
commitdaed5ecdf85e983a9ff2aa0d7db5c7fdd34b71ab (patch)
tree5a4224b03b958b7bf6eece7c9ad92530a77688c3 /chrome/chrome_tests.gypi
parent44d8ce76bed0ef853a28dc55164b8e2246f3eddc (diff)
downloadchromium_src-daed5ecdf85e983a9ff2aa0d7db5c7fdd34b71ab.zip
chromium_src-daed5ecdf85e983a9ff2aa0d7db5c7fdd34b71ab.tar.gz
chromium_src-daed5ecdf85e983a9ff2aa0d7db5c7fdd34b71ab.tar.bz2
Take 3: Refactor, relocate and rename ProfileSyncServiceTestHarness.
ProfileSyncServiceTestHarness is an automation helper class that lives in chrome/test. It contains methods that allow you to wait on various sync events, and is used by the sync integration tests. We now need to re-use ProfileSyncServiceTestHarness to support sync operations in TestingAutomationProvider, a class that lives in chrome/browser. In order to accomplish this, we do the following things in this patch: 1) Move ProfileSyncServiceTestHarness to chrome/browser, so that TestingAutomationProvider can re-use its functionality, and rename it to ProfileSyncServiceHarness (a less wordy name that reflects the purpose of the class). 2) Since TestingAutomationProvider relies on the fact that the UI message loop is always running, we must change the default behavior of ProfileSyncServiceHarness to not start/stop the UI message loop. We make 2 key wait methods pure virtual: SignalStateComplete() and AwaitStatusChange(). 3) The integration tests use a specialization of ProfileSyncServiceHarness that start/stop the UI message loop. 4) TestingAutomationProvider can go on to use a specialization of ProfileSyncServiceHarness that uses WaitableEvents. (coming up in another patch) NOTE: There were 2 earlier attempts at checking in this patch -- See http://codereview.chromium.org/3492005/show and http://codereview.chromium.org/3419029/show. BUG=56460 TEST=sync_integration_tests Review URL: http://codereview.chromium.org/4145003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c547c26..b3b031b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2667,8 +2667,6 @@
'test/live_sync/multiple_client_live_bookmarks_sync_test.cc',
'test/live_sync/multiple_client_live_passwords_sync_test.cc',
'test/live_sync/multiple_client_live_preferences_sync_test.cc',
- 'test/live_sync/profile_sync_service_test_harness.cc',
- 'test/live_sync/profile_sync_service_test_harness.h',
'test/live_sync/single_client_live_bookmarks_sync_test.cc',
'test/live_sync/single_client_live_passwords_sync_test.cc',
'test/live_sync/single_client_live_preferences_sync_test.cc',