Revert 110555 - sync: Remove ModelNeutralExecuteImpl()

chrome/browser/sync/engine/model_changing_syncer_command.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_MODEL_CHANGING_SYNCER_COMMAND_H_
 #define CHROME_BROWSER_SYNC_ENGINE_MODEL_CHANGING_SYNCER_COMMAND_H_
 #pragma once
 
 #include "chrome/browser/sync/engine/syncer_command.h"
 #include "chrome/browser/sync/util/unrecoverable_error_info.h"
@@ skipping 22 matching lines @@
   virtual void ExecuteImpl(sessions::SyncSession* session);
 
   // wrapper so implementations don't worry about storing work_session
   UnrecoverableErrorInfo StartChangingModel() {
     // TODO(lipalani): |ModelChangingExecuteImpl| should return an
     // UnrecoverableErrorInfo struct.
     ModelChangingExecuteImpl(work_session_);
     return UnrecoverableErrorInfo();
   }
 
+  // Sometimes, a command has work to do that needs to touch global state
+  // belonging to multiple ModelSafeGroups, but in a way that is known to be
+  // safe.  This will be called once, prior to ModelChangingExecuteImpl,
+  // *without* a ModelSafeGroup restriction in place on the SyncSession.
+  // Returns true on success, false on failure.
+  // TODO(tim): Remove this (bug 36594).
+  virtual bool ModelNeutralExecuteImpl(sessions::SyncSession* session);
+
   // Abstract method to be implemented by subclasses to handle logic that
   // operates on the model.  This is invoked with a SyncSession ModelSafeGroup
   // restriction in place so that bits of state belonging to data types
   // running on an unsafe thread are siloed away.
   virtual void ModelChangingExecuteImpl(sessions::SyncSession* session) = 0;
 
  private:
   // ExecuteImpl is expected to be run by SyncerCommand to set work_session.
   // StartChangingModel is called to start this command running.
   // Implementations will implement ModelChangingExecuteImpl and not
   // worry about storing the session or setting it. They are given work_session.
   sessions::SyncSession* work_session_;
 
   DISALLOW_COPY_AND_ASSIGN(ModelChangingSyncerCommand);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_MODEL_CHANGING_SYNCER_COMMAND_H_