[Sync] Move change-related methods out of SyncManager::Observer

chrome/browser/sync/glue/sync_backend_registrar.cc

 // Copyright (c) 2011 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/glue/sync_backend_registrar.h"
 
 #include <algorithm>
+#include <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/browser_thread_model_worker.h"
 #include "chrome/browser/sync/glue/history_model_worker.h"
 #include "chrome/browser/sync/glue/password_model_worker.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
@@ skipping 181 matching lines @@
   base::AutoLock lock(lock_);
   ChangeProcessor* change_processor = GetProcessorUnsafe(type);
   if (change_processor) {
     change_processor->Stop();
   }
   routing_info_.erase(type);
   ignore_result(processors_.erase(type));
   DCHECK(!GetProcessorUnsafe(type));
 }
 
-ChangeProcessor* SyncBackendRegistrar::GetProcessor(
-    syncable::ModelType type) {
-  base::AutoLock lock(lock_);
-  ChangeProcessor* processor = GetProcessorUnsafe(type);
-  if (!processor) {
-    return NULL;
-  }
-  // We can only check if |processor| exists, as otherwise the type is
-  // mapped to GROUP_PASSIVE.
-  CHECK(IsCurrentThreadSafeForModel(type));
-  CHECK(processor->IsRunning());
-  return processor;
+bool SyncBackendRegistrar::IsTypeActivatedForTest(
+    syncable::ModelType type) const {
+  return GetProcessor(type) != NULL;
+}
+
+void SyncBackendRegistrar::OnChangesApplied(
+    syncable::ModelType model_type,
+    const sync_api::BaseTransaction* trans,
+    const sync_api::ImmutableChangeRecordList& changes) {
+  ChangeProcessor* processor = GetProcessor(model_type);
+  if (!processor)
+    return;
+
+  processor->ApplyChangesFromSyncModel(trans, changes);
+}
+
+void SyncBackendRegistrar::OnChangesComplete(
+    syncable::ModelType model_type) {
+  ChangeProcessor* processor = GetProcessor(model_type);
+  if (!processor)
+    return;
+
+  // This call just notifies the processor that it can commit; it
+  // already buffered any changes it plans to makes so needs no
+  // further information.
+  processor->CommitChangesFromSyncModel();
 }
 
 void SyncBackendRegistrar::GetWorkers(
     std::vector<ModelSafeWorker*>* out) {
   base::AutoLock lock(lock_);
   out->clear();
   for (WorkerMap::const_iterator it = workers_.begin();
        it != workers_.end(); ++it) {
     out->push_back(it->second);
   }
 }
 
 void SyncBackendRegistrar::GetModelSafeRoutingInfo(
     ModelSafeRoutingInfo* out) {
   base::AutoLock lock(lock_);
   ModelSafeRoutingInfo copy(routing_info_);
   out->swap(copy);
 }
 
+ChangeProcessor* SyncBackendRegistrar::GetProcessor(
+    syncable::ModelType type) const {
+  base::AutoLock lock(lock_);
+  ChangeProcessor* processor = GetProcessorUnsafe(type);
+  if (!processor) {
+    return NULL;

[tim (not reviewing), 2011/09/20 16:04:59]

nit / consistency - I'm seeing braceless single-line ifs elsewhere

[akalin, 2011/09/20 21:14:42]

Done.

+  }
+  // We can only check if |processor| exists, as otherwise the type is
+  // mapped to GROUP_PASSIVE.
+  CHECK(IsCurrentThreadSafeForModel(type));
+  CHECK(processor->IsRunning());
+  return processor;
+}
+
 ChangeProcessor* SyncBackendRegistrar::GetProcessorUnsafe(
-    syncable::ModelType type) {
+    syncable::ModelType type) const {
   lock_.AssertAcquired();
   std::map<syncable::ModelType, ChangeProcessor*>::const_iterator it =
       processors_.find(type);
 
   // Until model association happens for a datatype, it will not
   // appear in the processors list.  During this time, it is OK to
   // drop changes on the floor (since model association has not
   // happened yet).  When the data type is activated, model
   // association takes place then the change processor is added to the
   // |processors_| list.
   if (it == processors_.end())
     return NULL;
 
   return it->second;
 }
 
 bool SyncBackendRegistrar::IsCurrentThreadSafeForModel(
     syncable::ModelType model_type) const {
   lock_.AssertAcquired();
   return IsOnThreadForGroup(GetGroupForModelType(model_type, routing_info_));
 }
 
 }  // namespace browser_sync