summaryrefslogtreecommitdiffstats
path: root/sync/engine/syncer.h
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 19:12:17 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 19:12:17 +0000
commitbfd80f0bbc586d6254724530c1dbe376fd18e7eb (patch)
treef2bbe743018b4bc5ffef0c67e7a45805ac520aa5 /sync/engine/syncer.h
parentaaffe1b11632e13935ef54148bfd6373e2c08cd7 (diff)
downloadchromium_src-bfd80f0bbc586d6254724530c1dbe376fd18e7eb.zip
chromium_src-bfd80f0bbc586d6254724530c1dbe376fd18e7eb.tar.gz
chromium_src-bfd80f0bbc586d6254724530c1dbe376fd18e7eb.tar.bz2
Revert 213642 "Lock-free shutdown of profile sync service. Chang..."
Reverting due to memory leaks. BUG=264325 > 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 TBR=haitaol@chromium.org Review URL: https://codereview.chromium.org/20374005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/syncer.h')
-rw-r--r--sync/engine/syncer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h
index eae6d87..f2e3c73 100644
--- a/sync/engine/syncer.h
+++ b/sync/engine/syncer.h
@@ -17,7 +17,7 @@
#include "sync/engine/syncer_types.h"
#include "sync/internal_api/public/base/model_type.h"
#include "sync/sessions/sync_session.h"
-#include "sync/util/extensions_activity.h"
+#include "sync/util/extensions_activity_monitor.h"
namespace syncer {