Relieve SyncerSession,SyncCycleState, SyncProcessState, SyncerSession, Syncer...

chrome/browser/sync/engine/build_commit_command.cc

 // Copyright (c) 2006-2009 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.
 
 #include "chrome/browser/sync/engine/build_commit_command.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
-#include "chrome/browser/sync/engine/syncer_session.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
-#include "chrome/browser/sync/engine/syncproto.h"
+#include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
 #include "chrome/browser/sync/util/sync_types.h"
 
 using std::set;
 using std::string;
 using std::vector;
 using syncable::ExtendedAttribute;
 using syncable::Id;
 using syncable::MutableEntry;
 
 namespace browser_sync {
 
+using sessions::SyncSession;
+
 BuildCommitCommand::BuildCommitCommand() {}
 BuildCommitCommand::~BuildCommitCommand() {}
 
 void BuildCommitCommand::AddExtensionsActivityToMessage(
-    SyncerSession* session, CommitMessage* message) {
+    SyncSession* session, CommitMessage* message) {
   const ExtensionsActivityMonitor::Records& records =
       session->extensions_activity();
   for (ExtensionsActivityMonitor::Records::const_iterator it = records.begin();
        it != records.end(); ++it) {
     sync_pb::CommitMessage_ChromiumExtensionsActivity* activity_message =
         message->add_extensions_activity();
     activity_message->set_extension_id(it->second.extension_id);
     activity_message->set_bookmark_writes_since_last_commit(
         it->second.bookmark_write_count);
   }
 }
 
-void BuildCommitCommand::ExecuteImpl(SyncerSession* session) {
+void BuildCommitCommand::ExecuteImpl(SyncSession* session) {
   ClientToServerMessage message;
-  message.set_share(session->account_name());
+  message.set_share(session->context()->account_name());
   message.set_message_contents(ClientToServerMessage::COMMIT);
 
   CommitMessage* commit_message = message.mutable_commit();
   commit_message->set_cache_guid(
       session->write_transaction()->directory()->cache_guid());
   AddExtensionsActivityToMessage(session, commit_message);
 
-  const vector<Id>& commit_ids = session->commit_ids();
+  const vector<Id>& commit_ids = session->status_controller()->commit_ids();
   for (size_t i = 0; i < commit_ids.size(); i++) {
     Id id = commit_ids[i];
     SyncEntity* sync_entry =
         static_cast<SyncEntity*>(commit_message->add_entries());
     sync_entry->set_id(id);
     MutableEntry meta_entry(session->write_transaction(),
                             syncable::GET_BY_ID,
                             id);
     CHECK(meta_entry.good());
     // This is the only change we make to the entry in this function.
@@ skipping 74 matching lines @@
 
       if (!meta_entry.Get(syncable::IS_DIR)) {
         string bookmark_url = meta_entry.Get(syncable::BOOKMARK_URL);
         bookmark->set_bookmark_url(bookmark_url);
         SyncerProtoUtil::CopyBlobIntoProtoBytes(
             meta_entry.Get(syncable::BOOKMARK_FAVICON),
             bookmark->mutable_bookmark_favicon());
       }
     }
   }
-  session->set_commit_message(message);
+  session->status_controller()->mutable_commit_message()->CopyFrom(message);
 }
 
 }  // namespace browser_sync