Remove stl_util from sync.

components/sync/syncable/directory_backing_store_unittest.cc

 // Copyright 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 "components/sync/syncable/directory_backing_store.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "components/sync/base/node_ordinal.h"
 #include "components/sync/base/time.h"
 #include "components/sync/protocol/bookmark_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/on_disk_directory_backing_store.h"
-#include "components/sync/syncable/syncable-inl.h"
 #include "components/sync/test/directory_backing_store_corruption_testing.h"
 #include "components/sync/test/test_directory_backing_store.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "sql/test/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest-param-test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 namespace syncable {
@@ skipping 4147 matching lines @@
   {
     std::unique_ptr<OnDiskDirectoryBackingStoreForTest> dbs(
         new OnDiskDirectoryBackingStoreForTest(GetUsername(),
                                                GetDatabasePath()));
     dbs->SetCatastrophicErrorHandler(handler);
     ASSERT_TRUE(dbs->db_->has_error_callback());
     // Load the DB, and save one entry.
     ASSERT_TRUE(LoadAndIgnoreReturnedData(dbs.get()));
     ASSERT_FALSE(dbs->DidFailFirstOpenAttempt());
     Directory::SaveChangesSnapshot snapshot;
-    snapshot.dirty_metas.insert(CreateEntry(2, "").release());
+    snapshot.dirty_metas.insert(CreateEntry(2, ""));
     ASSERT_TRUE(dbs->SaveChanges(snapshot));
   }
 
   base::RunLoop().RunUntilIdle();
   // No catastrophic errors have happened. See that it hasn't be called yet.
   ASSERT_FALSE(was_called);
 
   // Corrupt the DB. Some forms of corruption (like this one) will be detected
   // upon loading the Sync DB.
   ASSERT_TRUE(sql::test::CorruptSizeInHeader(GetDatabasePath()));
@@ skipping 28 matching lines @@
   std::unique_ptr<OnDiskDirectoryBackingStoreForTest> dbs(
       new OnDiskDirectoryBackingStoreForTest(GetUsername(), GetDatabasePath()));
   dbs->SetCatastrophicErrorHandler(handler);
   ASSERT_TRUE(dbs->db_->has_error_callback());
   ASSERT_TRUE(LoadAndIgnoreReturnedData(dbs.get()));
   ASSERT_FALSE(dbs->DidFailFirstOpenAttempt());
   Directory::SaveChangesSnapshot snapshot;
   const std::string suffix(400, 'o');
   for (int i = 0; i < corruption_testing::kNumEntriesRequiredForCorruption;
        ++i) {
-    std::unique_ptr<EntryKernel> large_entry = CreateEntry(i, suffix);
-    snapshot.dirty_metas.insert(large_entry.release());
+    snapshot.dirty_metas.insert(CreateEntry(i, suffix));
   }
   ASSERT_TRUE(dbs->SaveChanges(snapshot));
   // Corrupt it.
   ASSERT_TRUE(corruption_testing::CorruptDatabase(GetDatabasePath()));
   // Attempt to save all those entries again. See that it fails (because of the
   // corruption).
   //
   // If this test fails because SaveChanges returned true, it may mean you need
   // to increase the number of entries written to the DB. See also
   // |kNumEntriesRequiredForCorruption|.
   ASSERT_FALSE(dbs->SaveChanges(snapshot));
   // At this point the handler has been posted but not executed.
   ASSERT_FALSE(was_called);
   // Pump the message loop and see that it is executed.
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(was_called);
 }
 
 }  // namespace syncable
 }  // namespace syncer