Reland 87645 with clang fixes.

chrome/browser/sync/glue/generic_change_processor.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_GENERIC_CHANGE_PROCESSOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_GENERIC_CHANGE_PROCESSOR_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 27 matching lines @@
   // Build and store a list of all changes into |syncer_changes_|.
   virtual void ApplyChangesFromSyncModel(
       const sync_api::BaseTransaction* trans,
       const sync_api::SyncManager::ChangeRecord* changes,
       int change_count) OVERRIDE;
   // Passes |syncer_changes_|, built in ApplyChangesFromSyncModel, onto
   // |local_service_| by way of it's ProcessSyncChanges method.
   virtual void CommitChangesFromSyncModel() OVERRIDE;
 
   // SyncChangeProcessor implementation.
-  virtual void ProcessSyncChanges(const tracked_objects::Location& from_here,
-                                  const SyncChangeList& change_list) OVERRIDE;
+  virtual SyncError ProcessSyncChanges(
+      const tracked_objects::Location& from_here,
+      const SyncChangeList& change_list) OVERRIDE;
 
   // Fills |current_sync_data| with all the syncer data for the specified type.
-  virtual bool GetSyncDataForType(syncable::ModelType type,
-                                  SyncDataList* current_sync_data);
+  virtual SyncError GetSyncDataForType(syncable::ModelType type,
+                                       SyncDataList* current_sync_data);
 
   // Generic versions of AssociatorInterface methods. Called by
   // SyncableServiceAdapter.
   bool SyncModelHasUserCreatedNodes(syncable::ModelType type,
                                     bool* has_nodes);
   bool CryptoReadyIfNecessary(syncable::ModelType type);
  protected:
   // ChangeProcessor interface.
   virtual void StartImpl(Profile* profile) OVERRIDE;  // Not implemented.
   virtual void StopImpl() OVERRIDE;  // Not implemented.
@@ skipping 12 matching lines @@
   // be able to access the sync model before the change processor begins
   // listening to changes (the local_service_ will be interacting with us
   // when it starts up). As such we can't wait until Start(_) has been called,
   // and have to keep a local pointer to the user_share.
   sync_api::UserShare* user_share_;
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_GENERIC_CHANGE_PROCESSOR_H_