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

chrome/browser/sync/engine/syncer_unittest.cc

 // 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.
 //
 // Syncer unit tests. Unfortunately a lot of these tests
 // are outdated and need to be reworked and updated.
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 31 matching lines @@
 using std::set;
 using std::string;
 
 namespace browser_sync {
 
 using syncable::BaseTransaction;
 using syncable::Blob;
 using syncable::CountEntriesWithName;
 using syncable::Directory;
 using syncable::Entry;
-using syncable::ExtendedAttribute;
-using syncable::ExtendedAttributeKey;
 using syncable::GetFirstEntryWithName;
 using syncable::GetOnlyEntryWithName;
 using syncable::Id;
 using syncable::MutableEntry;
-using syncable::MutableExtendedAttribute;
 using syncable::ReadTransaction;
 using syncable::ScopedDirLookup;
 using syncable::WriteTransaction;
 
 using syncable::BASE_VERSION;
 using syncable::CREATE;
 using syncable::CREATE_NEW_UPDATE_ITEM;
 using syncable::GET_BY_HANDLE;
 using syncable::GET_BY_ID;
 using syncable::GET_BY_CLIENT_TAG;
@@ skipping 19 matching lines @@
 using syncable::UNIQUE_SERVER_TAG;
 using syncable::SPECIFICS;
 using syncable::UNITTEST;
 
 using sessions::ConflictProgress;
 using sessions::ScopedSetSessionWriteTransaction;
 using sessions::StatusController;
 using sessions::SyncSessionContext;
 using sessions::SyncSession;
 
-namespace {
-const char* kTestData = "Hello World!";
-const int kTestDataLen = 12;
-const int64 kTestLogRequestTimestamp = 123456;
-}  // namespace
-
 class SyncerTest : public testing::Test,
                    public SyncSession::Delegate,
                    public ModelSafeWorkerRegistrar,
                    public ChannelEventHandler<SyncerEvent> {
  protected:
   SyncerTest() : syncer_(NULL) {}
 
   // SyncSession::Delegate implementation.
   virtual void OnSilencedUntil(const base::TimeTicks& silenced_until) {
     FAIL() << "Should not get silenced.";
@@ skipping 90 matching lines @@
   virtual void TearDown() {
     mock_server_.reset();
     hookup_.reset();
     delete syncer_;
     syncer_ = NULL;
     syncdb_.TearDown();
   }
   void WriteTestDataToEntry(WriteTransaction* trans, MutableEntry* entry) {
     EXPECT_FALSE(entry->Get(IS_DIR));
     EXPECT_FALSE(entry->Get(IS_DEL));
-    Blob test_value(kTestData, kTestData + kTestDataLen);
-    ExtendedAttributeKey key(entry->Get(META_HANDLE), "DATA");
-    MutableExtendedAttribute attr(trans, CREATE, key);
-    attr.mutable_value()->swap(test_value);
     sync_pb::EntitySpecifics specifics;
     specifics.MutableExtension(sync_pb::bookmark)->set_url("http://demo/");
     specifics.MutableExtension(sync_pb::bookmark)->set_favicon("PNG");
     entry->Put(syncable::SPECIFICS, specifics);
     entry->Put(syncable::IS_UNSYNCED, true);
   }
   void VerifyTestDataInEntry(BaseTransaction* trans, Entry* entry) {
     EXPECT_FALSE(entry->Get(IS_DIR));
     EXPECT_FALSE(entry->Get(IS_DEL));
-    Blob test_value(kTestData, kTestData + kTestDataLen);
-    ExtendedAttributeKey key(entry->Get(META_HANDLE), "DATA");
-    ExtendedAttribute attr(trans, GET_BY_HANDLE, key);
-    EXPECT_FALSE(attr.is_deleted());
-    EXPECT_TRUE(test_value == attr.value());
     VerifyTestBookmarkDataInEntry(entry);
   }
   void VerifyTestBookmarkDataInEntry(Entry* entry) {
     const sync_pb::EntitySpecifics& specifics = entry->Get(syncable::SPECIFICS);
     EXPECT_TRUE(specifics.HasExtension(sync_pb::bookmark));
     EXPECT_EQ("PNG", specifics.GetExtension(sync_pb::bookmark).favicon());
     EXPECT_EQ("http://demo/", specifics.GetExtension(sync_pb::bookmark).url());
   }
 
   void SyncRepeatedlyToTriggerConflictResolution(SyncSession* session) {
@@ skipping 293 matching lines @@
     EXPECT_TRUE(iterator.Current() == session_metahandles[2]);
     EXPECT_FALSE(iterator.Increment());
 
     EXPECT_FALSE(iterator.Valid());
   }
 }
 
 TEST_F(SyncerTest, TestGetUnsyncedAndSimpleCommit) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   ASSERT_TRUE(dir.good());
-  string xattr_key = "key";
   {
     WriteTransaction wtrans(dir, UNITTEST, __FILE__, __LINE__);
     MutableEntry parent(&wtrans, syncable::CREATE, wtrans.root_id(),
                         "Pete");
     ASSERT_TRUE(parent.good());
     parent.Put(syncable::IS_UNSYNCED, true);
     parent.Put(syncable::IS_DIR, true);
     parent.Put(syncable::SPECIFICS, DefaultBookmarkSpecifics());
     parent.Put(syncable::BASE_VERSION, 1);
     parent.Put(syncable::ID, parent_id_);
@@ skipping 504 matching lines @@
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   ASSERT_TRUE(dir.good());
   mock_server_->AddUpdateDirectory(1, 0, "foo:", 1, 10);
   syncer_->SyncShare(this);
   mock_server_->AddUpdateDirectory(2, 0, "foo:", 1, 20);
   SyncRepeatedlyToTriggerStuckSignal(session_.get());
   EXPECT_FALSE(session_->status_controller()->syncer_status().syncer_stuck);
   syncer_events_.clear();
 }
 
-TEST_F(SyncerTest, ExtendedAttributeWithNullCharacter) {
-  ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
-  ASSERT_TRUE(dir.good());
-  size_t xattr_count = 2;
-  string xattr_keys[] = { "key", "key2" };
-  syncable::Blob xattr_values[2];
-  const char* value[] = { "value", "val\0ue" };
-  int value_length[] = { 5, 6 };
-  for (size_t i = 0; i < xattr_count; i++) {
-    for (int j = 0; j < value_length[i]; j++)
-      xattr_values[i].push_back(value[i][j]);
-  }
-  sync_pb::SyncEntity* ent =
-      mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10);
-  mock_server_->AddUpdateExtendedAttributes(
-      ent, xattr_keys, xattr_values, xattr_count);
-
-  // Add some other items.
-  mock_server_->AddUpdateBookmark(2, 0, "fred", 2, 10);
-  mock_server_->AddUpdateBookmark(3, 0, "sue", 15, 10);
-
-  syncer_->SyncShare(this);
-  ReadTransaction trans(dir, __FILE__, __LINE__);
-  Entry entry1(&trans, syncable::GET_BY_ID, ids_.FromNumber(1));
-  ASSERT_TRUE(entry1.good());
-  EXPECT_TRUE(1 == entry1.Get(syncable::BASE_VERSION));
-  EXPECT_TRUE(1 == entry1.Get(syncable::SERVER_VERSION));
-  set<ExtendedAttribute> client_extended_attributes;
-  entry1.GetAllExtendedAttributes(&trans, &client_extended_attributes);
-  EXPECT_TRUE(xattr_count == client_extended_attributes.size());
-  for (size_t i = 0; i < xattr_count; i++) {
-    ExtendedAttributeKey key(entry1.Get(syncable::META_HANDLE), xattr_keys[i]);
-    ExtendedAttribute expected_xattr(&trans, syncable::GET_BY_HANDLE, key);
-    EXPECT_TRUE(expected_xattr.good());
-    for (int j = 0; j < value_length[i]; ++j) {
-      EXPECT_TRUE(xattr_values[i][j] ==
-          static_cast<char>(expected_xattr.value().at(j)));
-    }
-  }
-  Entry entry2(&trans, syncable::GET_BY_ID, ids_.FromNumber(2));
-  ASSERT_TRUE(entry2.good());
-  Entry entry3(&trans, syncable::GET_BY_ID, ids_.FromNumber(3));
-  ASSERT_TRUE(entry3.good());
-}
-
 TEST_F(SyncerTest, TestBasicUpdate) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   ASSERT_TRUE(dir.good());
   string id = "some_id";
   string parent_id = "0";
   string name = "in_root";
   int64 version = 10;
   int64 timestamp = 10;
   mock_server_->AddUpdateDirectory(id, parent_id, name, version, timestamp);
 
@@ skipping 3291 matching lines @@
   Add(low_id_);
   Add(high_id_);
   syncer_->SyncShare(this);
   ExpectLocalOrderIsByServerId();
 }
 
 const SyncerTest::CommitOrderingTest
 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
 
 }  // namespace browser_sync