Revert 105404 - [Sync] Refactor non-frontend DTC to handle new API properly.

chrome/browser/sync/glue/non_frontend_data_type_controller.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_GLUE_NON_FRONTEND_DATA_TYPE_CONTROLLER_H__
 #define CHROME_BROWSER_SYNC_GLUE_NON_FRONTEND_DATA_TYPE_CONTROLLER_H__
 #pragma once
 
 #include <string>
 
@@ skipping 115 matching lines @@
       const std::string& message) = 0;
   // Record association time. Called on Datatype's thread.
   virtual void RecordAssociationTime(base::TimeDelta time) = 0;
   // Record causes of start failure. Called on UI thread.
   virtual void RecordStartFailure(StartResult result) = 0;
 
   // Accessors and mutators used by derived classes.
   ProfileSyncFactory* profile_sync_factory() const;
   Profile* profile() const;
   ProfileSyncService* profile_sync_service() const;
-  void set_start_callback(StartCallback* callback);
   void set_state(State state);
-
-  virtual AssociatorInterface* associator() const;
-  virtual void set_model_associator(AssociatorInterface* associator);
-  virtual ChangeProcessor* change_processor() const;
-  virtual void set_change_processor(ChangeProcessor* change_processor);
+  void set_model_associator(AssociatorInterface* associator);
+  void set_change_processor(ChangeProcessor* change_processor);
 
  private:
   ProfileSyncFactory* const profile_sync_factory_;
   Profile* const profile_;
   ProfileSyncService* const profile_sync_service_;
 
   State state_;
 
   scoped_ptr<StartCallback> start_callback_;
   scoped_ptr<AssociatorInterface> model_associator_;
   scoped_ptr<ChangeProcessor> change_processor_;
 
   // Locks/Barriers for aborting association early.
   base::Lock abort_association_lock_;
   bool abort_association_;
   base::WaitableEvent abort_association_complete_;
 
   // Barrier to ensure that the datatype has been stopped on the DB thread
   // from the UI thread.
   base::WaitableEvent datatype_stopped_;
 
   DISALLOW_COPY_AND_ASSIGN(NonFrontendDataTypeController);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_NON_FRONTEND_DATA_TYPE_CONTROLLER_H__