Revert of Keep track of which attachments are referenced by which sync entries.

sync/syncable/directory_unittest.h

 // Copyright 2014 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_DIRECTORY_UNITTEST_H_
 #define SYNC_SYNCABLE_DIRECTORY_UNITTEST_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 13 matching lines @@
 
 namespace syncable {
 
 class BaseTransaction;
 
 // A test fixture for syncable::Directory.  Uses an in-memory database to keep
 // the unit tests fast.
 //
 // Serves as base class for several other test fixtures.
 class SyncableDirectoryTest : public testing::Test {
+ private:
  protected:
   static const char kDirectoryName[];
 
   SyncableDirectoryTest();
   virtual ~SyncableDirectoryTest();
 
   virtual void SetUp();
   virtual void TearDown();
 
   // Destroys any currently opened directory, creates and opens a new one.
   //
   // Returns result of the Open call.
   DirOpenResult ReopenDirectory();
 
   // Creates an empty entry and sets the ID field to a default one.
-  void CreateEntry(const ModelType& model_type, const std::string& entryname);
+  void CreateEntry(const std::string& entryname);
 
   // Creates an empty entry and sets the ID field to id.
-  void CreateEntry(const ModelType& model_type,
-                   const std::string& entryname,
-                   const int id);
+  void CreateEntry(const std::string& entryname, const int id);
 
-  void CreateEntry(const ModelType& model_type,
-                   const std::string& entryname,
-                   const Id& id);
-
-  void CreateEntryWithAttachmentMetadata(
-      const ModelType& model_type,
-      const std::string& entryname,
-      const Id& id,
-      const sync_pb::AttachmentMetadata& attachment_metadata);
-
-  void DeleteEntry(const Id& id);
+  void CreateEntry(const std::string& entryname, Id id);
 
   // When a directory is saved then loaded from disk, it will pass through
   // DropDeletedEntries().  This will remove some entries from the directory.
   // This function is intended to simulate that process.
   //
   // WARNING: The directory will be deleted by this operation.  You should
   // not have any pointers to the directory (open transactions included)
   // when you call this.
   DirOpenResult SimulateSaveAndReloadDir();
 
@@ skipping 28 matching lines @@
   FakeEncryptor encryptor_;
   TestUnrecoverableErrorHandler handler_;
   sql::Connection connection_;
 };
 
 }  // namespace syncable
 
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_DIRECTORY_UNITTEST_H_