summaryrefslogtreecommitdiffstats
path: root/sync/sync_core.gypi
diff options
context:
space:
mode:
authorhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 16:22:21 +0000
committerhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 16:22:21 +0000
commitbfd87698e2430dcd86c355b5d2cb4a4485d59790 (patch)
tree58c89db9b99b9d469fa98a5df645e578936e6141 /sync/sync_core.gypi
parentf43fb604df45f0747c12b66b20976f0512ee1308 (diff)
downloadchromium_src-bfd87698e2430dcd86c355b5d2cb4a4485d59790.zip
chromium_src-bfd87698e2430dcd86c355b5d2cb4a4485d59790.tar.gz
chromium_src-bfd87698e2430dcd86c355b5d2cb4a4485d59790.tar.bz2
Lock-free shutdown of profile sync service. Changes include:
* Disconnect non-frontend processor/associator to stop accessing directory so that sync backend can be shut down without waiting. * Change non-frontend controller so that creation/destruction of processor/associator doesn't depend on valid controller. So scoped wait on stopping controller can be removed. * Move sync thread to PSS. It's created when starting first backend and destroyed on last browser thread. BUG=19757 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210333 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210955 Review URL: https://chromiumcodereview.appspot.com/16770005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sync_core.gypi')
-rw-r--r--sync/sync_core.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/sync_core.gypi b/sync/sync_core.gypi
index 542040c..2b97fe7 100644
--- a/sync/sync_core.gypi
+++ b/sync/sync_core.gypi
@@ -169,8 +169,8 @@
'util/cryptographer.h',
'util/data_type_histogram.h',
'util/encryptor.h',
- 'util/extensions_activity_monitor.cc',
- 'util/extensions_activity_monitor.h',
+ 'util/extensions_activity.cc',
+ 'util/extensions_activity.h',
'util/get_session_name.cc',
'util/get_session_name.h',
'util/get_session_name_ios.mm',