Remove extended attributes. The lame broken codepath in the DBS was causing

chrome/browser/sync/syncable/directory_backing_store.h

 // Copyright (c) 2009 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_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 #define CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 
 #include <set>
 #include <string>
 
@@ skipping 41 matching lines @@
 // SaveChanges is called a new sqlite3 handle is created, and it will get closed
 // when the DBS is destroyed, which is the reason for the requirement that the
 // thread that "uses" the DBS is the thread that destroys it.
 class DirectoryBackingStore {
  public:
   DirectoryBackingStore(const std::string& dir_name,
                         const FilePath& backing_filepath);
 
   virtual ~DirectoryBackingStore();
 
-  // Loads and drops all currently persisted meta entries into
-  // |entry_bucket|, all currently persisted xattrs in |xattrs_bucket|,
-  // and loads appropriate persisted kernel info in |info_bucket|.
+  // Loads and drops all currently persisted meta entries into |entry_bucket|
+  // and loads appropriate persisted kernel info into |info_bucket|.
   // NOTE: On success (return value of OPENED), the buckets are populated with
   // newly allocated items, meaning ownership is bestowed upon the caller.
   DirOpenResult Load(MetahandlesIndex* entry_bucket,
-                     ExtendedAttributes* xattrs_bucket,
                      Directory::KernelLoadInfo* kernel_load_info);
 
   // Updates the on-disk store with the input |snapshot| as a database
   // transaction.  Does NOT open any syncable transactions as this would cause
   // opening transactions elsewhere to block on synchronous I/O.
   // DO NOT CALL THIS FROM MORE THAN ONE THREAD EVER.  Also, whichever thread
   // calls SaveChanges *must* be the thread that owns/destroys |this|.
   virtual bool SaveChanges(const Directory::SaveChangesSnapshot& snapshot);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion67To68);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion68To69);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion69To70);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion70To71);
+  FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion71To72);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, ModelTypeIds);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, Corruption);
-  FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, DeleteEntries);
   FRIEND_TEST_ALL_PREFIXES(MigrationTest, ToCurrentVersion);
   friend class MigrationTest;
 
   // General Directory initialization and load helpers.
   DirOpenResult InitializeTables();
   // Returns an sqlite return code, usually SQLITE_DONE.
   int CreateTables();
 
   // Create 'share_info' or 'temp_share_info' depending on value of
   // is_temporary.  Returns an sqlite return code, SQLITE_DONE on success.
   int CreateShareInfoTable(bool is_temporary);
   // Create 'metas' or 'temp_metas' depending on value of is_temporary.
   // Returns an sqlite return code, SQLITE_DONE on success.
   int CreateMetasTable(bool is_temporary);
   // Returns an sqlite return code, SQLITE_DONE on success.
   int CreateModelsTable();
-  // Returns an sqlite return code, SQLITE_DONE on success.
-  int CreateExtendedAttributeTable();
 
   // We don't need to load any synced and applied deleted entries, we can
   // in fact just purge them forever on startup.
   bool DropDeletedEntries();
   // Drops a table if it exists, harmless if the table did not already exist.
   int SafeDropTable(const char* table_name);
 
   // Load helpers for entries and attributes.
   bool LoadEntries(MetahandlesIndex* entry_bucket);
-  bool LoadExtendedAttributes(ExtendedAttributes* xattrs_bucket);
   bool LoadInfo(Directory::KernelLoadInfo* info);
 
   // Save/update helpers for entries.  Return false if sqlite commit fails.
   bool SaveEntryToDB(const EntryKernel& entry);
   bool SaveNewEntryToDB(const EntryKernel& entry);
   bool UpdateEntryToDB(const EntryKernel& entry);
 
-  // Save/update helpers for attributes.  Return false if sqlite commit fails.
-  bool SaveExtendedAttributeToDB(ExtendedAttributes::const_iterator i);
-  bool DeleteExtendedAttributeFromDB(ExtendedAttributes::const_iterator i);
-
   // Creates a new sqlite3 handle to the backing database. Sets sqlite operation
   // timeout preferences and registers our overridden sqlite3 operators for
   // said handle.  Returns true on success, false if the sqlite open operation
   // did not succeed.
   bool OpenAndConfigureHandleHelper(sqlite3** handle) const;
   // Initialize and destroy load_dbhandle_.  Broken out for testing.
   bool BeginLoad();
   void EndLoad();
 
   // Lazy creation of save_dbhandle_ for use by SaveChanges code path.
@@ skipping 19 matching lines @@
                           void(*handler_function) (
                               SQLStatement* old_value_query,
                               int old_value_column,
                               sync_pb::EntitySpecifics* mutable_new_value));
 
   // Individual version migrations.
   bool MigrateVersion67To68();
   bool MigrateVersion68To69();
   bool MigrateVersion69To70();
   bool MigrateVersion70To71();
+  bool MigrateVersion71To72();
 
   // The handle to our sqlite on-disk store for initialization and loading, and
   // for saving changes periodically via SaveChanges, respectively.
   // TODO(timsteele): We should only have one handle here.  The reason we need
   // two at the moment is because the DB can be opened by either the AuthWatcher
   // or SyncCore threads, but SaveChanges is always called by the latter.  We
   // need to change initialization so the DB is only accessed from one thread.
   sqlite3* load_dbhandle_;
   sqlite3* save_dbhandle_;
 
   std::string dir_name_;
   FilePath backing_filepath_;
 
   // Set to true if migration left some old columns around that need to be
   // discarded.
   bool needs_column_refresh_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryBackingStore);
 };
 
 }  // namespace syncable
 
 #endif  // CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_