USS SyncContextProxy / data type activation refactoring

sync/internal_api/public/activation_context.h

Index: sync/internal_api/public/activation_context.h
diff --git a/sync/internal_api/public/activation_context.h b/sync/internal_api/public/activation_context.h
new file mode 100644
index 0000000000000000000000000000000000000000..76f62cb40d1f483747125b24d64687869eed3d83
--- /dev/null
+++ b/sync/internal_api/public/activation_context.h
@@ -0,0 +1,36 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SYNC_INTERNAL_API_PUBLIC_ACTIVATION_CONTEXT_H_
+#define SYNC_INTERNAL_API_PUBLIC_ACTIVATION_CONTEXT_H_
+
+#include "base/basictypes.h"

[pavely, 2015/09/25 18:22:38]

I think you can remove basictypes.h. This file is not using it.
Also for scoped_refptr you need to include base/memory/ref_counted.h

[stanisc, 2015/09/26 00:16:01]

Done.

+#include "base/memory/weak_ptr.h"
+#include "base/sequenced_task_runner.h"
+#include "sync/base/sync_export.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
+
+namespace syncer_v2 {
+class ModelTypeProcessor;
+
+// The state passed from ModelType Processor to Sync thread during DataType

[pavely, 2015/09/25 18:22:39]

nit: ModelType Processor => ModelTypeProcessor

[stanisc, 2015/09/26 00:16:01]

Done.

+// activation.
+struct SYNC_EXPORT_PRIVATE ActivationContext {
+  ActivationContext();
+  ~ActivationContext();
+
+  // Initial DataTypeState at the moment of activation.
+  DataTypeState data_type_state;
+  // Pending updates from the previous session.
+  // TODO(stanisc): crbug.com/529498: should remove pending updates.
+  UpdateResponseDataList saved_pending_updates;
+  // Task runner for the data type.
+  scoped_refptr<base::SequencedTaskRunner> type_task_runner;
+  // ModelTypeProcessor for the data type.
+  base::WeakPtr<ModelTypeProcessor> type_processor;
+};
+
+}  // namespace syncer_v2
+
+#endif  // SYNC_INTERNAL_API_PUBLIC_ACTIVATION_CONTEXT_H_