summaryrefslogtreecommitdiffstats
path: root/sync/sessions/sync_session.h
diff options
context:
space:
mode:
Diffstat (limited to 'sync/sessions/sync_session.h')
-rw-r--r--sync/sessions/sync_session.h42
1 files changed, 0 insertions, 42 deletions
diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h
index 9272bae..126d57f 100644
--- a/sync/sessions/sync_session.h
+++ b/sync/sessions/sync_session.h
@@ -30,15 +30,10 @@
#include "sync/sessions/ordered_commit_set.h"
#include "sync/sessions/status_controller.h"
#include "sync/sessions/sync_session_context.h"
-#include "sync/util/extensions_activity_monitor.h"
namespace syncer {
class ModelSafeWorker;
-namespace syncable {
-class WriteTransaction;
-}
-
namespace sessions {
class SYNC_EXPORT_PRIVATE SyncSession {
@@ -113,7 +108,6 @@ class SYNC_EXPORT_PRIVATE SyncSession {
// TODO(akalin): Split this into context() and mutable_context().
SyncSessionContext* context() const { return context_; }
Delegate* delegate() const { return delegate_; }
- syncable::WriteTransaction* write_transaction() { return write_transaction_; }
const StatusController& status_controller() const {
return *status_controller_.get();
}
@@ -121,21 +115,9 @@ class SYNC_EXPORT_PRIVATE SyncSession {
return status_controller_.get();
}
- const ExtensionsActivityMonitor::Records& extensions_activity() const {
- return extensions_activity_;
- }
- ExtensionsActivityMonitor::Records* mutable_extensions_activity() {
- return &extensions_activity_;
- }
-
const SyncSourceInfo& source() const { return source_; }
private:
- // Extend the encapsulation boundary to utilities for internal member
- // assignments. This way, the scope of these actions is explicit, they can't
- // be overridden, and assigning is always accompanied by unassigning.
- friend class ScopedSetSessionWriteTransaction;
-
// The context for this session, guaranteed to outlive |this|.
SyncSessionContext* const context_;
@@ -146,12 +128,6 @@ class SYNC_EXPORT_PRIVATE SyncSession {
// Currently used only for logging.
std::vector<SyncSourceInfo> debug_info_sources_list_;
- // Information about extensions activity since the last successful commit.
- ExtensionsActivityMonitor::Records extensions_activity_;
-
- // Used to allow various steps to share a transaction. Can be NULL.
- syncable::WriteTransaction* write_transaction_;
-
// The delegate for this session, must never be NULL.
Delegate* const delegate_;
@@ -161,24 +137,6 @@ class SYNC_EXPORT_PRIVATE SyncSession {
DISALLOW_COPY_AND_ASSIGN(SyncSession);
};
-// Installs a WriteTransaction to a given session and later clears it when the
-// utility falls out of scope. Transactions are not nestable, so it is an error
-// to try and use one of these if the session already has a transaction.
-class ScopedSetSessionWriteTransaction {
- public:
- ScopedSetSessionWriteTransaction(SyncSession* session,
- syncable::WriteTransaction* trans)
- : session_(session) {
- DCHECK(!session_->write_transaction_);
- session_->write_transaction_ = trans;
- }
- ~ScopedSetSessionWriteTransaction() { session_->write_transaction_ = NULL; }
-
- private:
- SyncSession* session_;
- DISALLOW_COPY_AND_ASSIGN(ScopedSetSessionWriteTransaction);
-};
-
} // namespace sessions
} // namespace syncer