Remove stl_util from sync.

components/sync/syncable/directory.h

 // Copyright 2013 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 COMPONENTS_SYNC_SYNCABLE_DIRECTORY_H_
 #define COMPONENTS_SYNC_SYNCABLE_DIRECTORY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 118 matching lines @@
   // the backing store.
   struct SaveChangesSnapshot {
     SaveChangesSnapshot();
     ~SaveChangesSnapshot();
 
     // Returns true if this snapshot has any unsaved metahandle changes.
     bool HasUnsavedMetahandleChanges() const;
 
     KernelShareInfoStatus kernel_info_status;
     PersistedKernelInfo kernel_info;
-    EntryKernelSet dirty_metas;
+    OwnedEntryKernelSet dirty_metas;
     MetahandleSet metahandles_to_purge;
-    EntryKernelSet delete_journals;
+    OwnedEntryKernelSet delete_journals;
     MetahandleSet delete_journals_to_purge;
   };
 
   struct Kernel {
     // |delegate| must not be NULL.  |transaction_observer| must be
     // initialized.
     Kernel(const std::string& name,
            const KernelLoadInfo& info,
            DirectoryChangeDelegate* delegate,
            const WeakHandle<TransactionObserver>& transaction_observer);
@@ skipping 450 matching lines @@
   // Append the handles of the children of |parent_id| to |result|.
   void AppendChildHandles(const ScopedKernelLock& lock,
                           const Id& parent_id,
                           Directory::Metahandles* result);
 
   // Helper methods used by PurgeDisabledTypes.
   void UnapplyEntry(EntryKernel* entry);
   void DeleteEntry(const ScopedKernelLock& lock,
                    bool save_to_journal,
                    EntryKernel* entry,
-                   EntryKernelSet* entries_to_journal);
+                   OwnedEntryKernelSet* entries_to_journal);
 
   // A private version of the public GetMetaHandlesOfType for when you already
   // have a ScopedKernelLock.
   void GetMetaHandlesOfType(const ScopedKernelLock& lock,
                             BaseTransaction* trans,
                             ModelType type,
                             std::vector<int64_t>* result);
 
   // Invoked by DirectoryBackingStore when a catastrophic database error is
   // detected.
@@ skipping 29 matching lines @@
 
   base::WeakPtrFactory<Directory> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Directory);
 };
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_SYNCABLE_DIRECTORY_H_