Revert 146262 - Revert "Revert 142517 - [Sync] Refactor sync configuration logic."

sync/syncable/syncable_mock.h

 // Copyright (c) 2012 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 SYNC_SYNCABLE_SYNCABLE_MOCK_H_
 #define SYNC_SYNCABLE_SYNCABLE_MOCK_H_
 
 #include <string>
 
 #include "sync/syncable/directory.h"
@@ skipping 11 matching lines @@
   explicit MockDirectory(syncer::UnrecoverableErrorHandler* handler);
   virtual ~MockDirectory();
 
   MOCK_METHOD1(GetEntryByHandle, syncable::EntryKernel*(int64));
 
   MOCK_METHOD2(set_last_downloadstamp, void(syncer::ModelType, int64));
 
   MOCK_METHOD1(GetEntryByClientTag,
                syncable::EntryKernel*(const std::string&));
 
-  MOCK_METHOD1(PurgeEntriesWithTypeIn, bool(syncer::ModelTypeSet));
+  MOCK_METHOD1(PurgeEntriesWithTypeIn, void(syncer::ModelTypeSet));
 
  private:
   syncer::FakeEncryptor encryptor_;
   syncable::NullDirectoryChangeDelegate delegate_;
 };
 
 class MockSyncableWriteTransaction : public syncable::WriteTransaction {
  public:
   MockSyncableWriteTransaction(
       const tracked_objects::Location& from_here, Directory *directory);
 };
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_SYNCABLE_MOCK_H_