WIP: The Bookmark Position Megapatch

sync/internal_api/sync_encryption_handler_impl_unittest.cc

 // 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.
 
 #include "sync/internal_api/sync_encryption_handler_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 51 matching lines @@
 }  // namespace
 
 class SyncEncryptionHandlerImplTest : public ::testing::Test {
  public:
   SyncEncryptionHandlerImplTest() {}
   virtual ~SyncEncryptionHandlerImplTest() {}
 
   virtual void SetUp() {
     test_user_share_.SetUp();
     SetUpEncryption();
-    CreateRootForType(NIGORI);
+    TestUserShare::CreateRoot(NIGORI, user_share());
   }
 
   virtual void TearDown() {
     PumpLoop();
     test_user_share_.TearDown();
   }
 
  protected:
   void SetUpEncryption() {
     encryption_handler_.reset(
         new SyncEncryptionHandlerImpl(user_share(),
                                       &encryptor_,
                                       "", ""  /* bootstrap tokens */));
     encryption_handler_->AddObserver(&observer_);
   }
 
-  void CreateRootForType(ModelType model_type) {
-    syncer::syncable::Directory* directory = user_share()->directory.get();
-
-    std::string tag_name = ModelTypeToRootTag(model_type);
-
-    syncable::WriteTransaction wtrans(FROM_HERE, syncable::UNITTEST, directory);
-    syncable::MutableEntry node(&wtrans,
-                                syncable::CREATE,
-                                wtrans.root_id(),
-                                tag_name);
-    node.Put(syncable::UNIQUE_SERVER_TAG, tag_name);
-    node.Put(syncable::IS_DIR, true);
-    node.Put(syncable::SERVER_IS_DIR, false);
-    node.Put(syncable::IS_UNSYNCED, false);
-    node.Put(syncable::IS_UNAPPLIED_UPDATE, false);
-    node.Put(syncable::SERVER_VERSION, 20);
-    node.Put(syncable::BASE_VERSION, 20);
-    node.Put(syncable::IS_DEL, false);
-    node.Put(syncable::ID, ids_.MakeServer(tag_name));
-    sync_pb::EntitySpecifics specifics;
-    syncer::AddDefaultFieldValue(model_type, &specifics);
-    node.Put(syncable::SPECIFICS, specifics);
-  }
-
   void PumpLoop() {
     message_loop_.RunUntilIdle();
   }
 
   // Getters for tests.
   UserShare* user_share() { return test_user_share_.user_share(); }
   SyncEncryptionHandlerImpl* encryption_handler() {
       return encryption_handler_.get();
   }
   SyncEncryptionHandlerObserverMock* observer() { return &observer_; }
@@ skipping 1594 matching lines @@
 
   // Verify we're still migrated and have proper encryption state.
   EXPECT_TRUE(encryption_handler()->MigratedToKeystore());
   EXPECT_TRUE(GetCryptographer()->is_ready());
   EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE);
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   VerifyMigratedNigori(KEYSTORE_PASSPHRASE, kCurKey);
 }
 
 }  // namespace syncer