Remove some uses of stl_util's STLDeleteContainerPointers.

ui/views/controls/textfield/textfield_model.h

 // Copyright 2014 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 UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_MODEL_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_MODEL_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 247 matching lines @@
   void ExecuteAndRecordDelete(gfx::Range range, bool mergeable);
   void ExecuteAndRecordReplaceSelection(internal::MergeType merge_type,
                                         const base::string16& new_text);
   void ExecuteAndRecordReplace(internal::MergeType merge_type,
                                size_t old_cursor_pos,
                                size_t new_cursor_pos,
                                const base::string16& new_text,
                                size_t new_text_start);
   void ExecuteAndRecordInsert(const base::string16& new_text, bool mergeable);
 
-  // Adds or merge |edit| into edit history. Return true if the edit
-  // has been merged and must be deleted after redo.
-  bool AddOrMergeEditHistory(internal::Edit* edit);
+  // Adds or merge |edit| into edit history. Return ownership of the edit if the
+  // edit has been merged and must be deleted after redo.
+  std::unique_ptr<internal::Edit> AddOrMergeEditHistory(
+      std::unique_ptr<internal::Edit> edit);
 
   // Modify the text buffer in following way:
   // 1) Delete the string from |delete_from| to |delte_to|.
   // 2) Insert the |new_text| at the index |new_text_insert_at|.
   //    Note that the index is after deletion.
   // 3) Move the cursor to |new_cursor_pos|.
   void ModifyText(size_t delete_from,
                   size_t delete_to,
                   const base::string16& new_text,
                   size_t new_text_insert_at,
                   size_t new_cursor_pos);
 
   void ClearComposition();
 
   // Clears the kill buffer. Used to clear global state between tests.
   static void ClearKillBuffer();
 
   // The TextfieldModel::Delegate instance should be provided by the owner.
   Delegate* delegate_;
 
   // The stylized text, cursor, selection, and the visual layout model.
   std::unique_ptr<gfx::RenderText> render_text_;
 
   // The composition range.
   gfx::Range composition_range_;
 
-  typedef std::list<internal::Edit*> EditHistory;
+  typedef std::list<std::unique_ptr<internal::Edit>> EditHistory;
   EditHistory edit_history_;
 
   // An iterator that points to the current edit that can be undone.
   // This iterator moves from the |end()|, meaining no edit to undo,
   // to the last element (one before |end()|), meaning no edit to redo.
   //
   // There is no edit to undo (== end()) when:
   //   1) in initial state. (nothing to undo)
   //   2) very 1st edit is undone.
   //   3) all edit history is removed.
   // There is no edit to redo (== last element or no element) when:
   //   1) in initial state. (nothing to redo)
   //   2) new edit is added. (redo history is cleared)
   //   3) redone all undone edits.
   EditHistory::iterator current_edit_;
 
   DISALLOW_COPY_AND_ASSIGN(TextfieldModel);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_MODEL_H_