tabs: Make the vector in MockTabStripModelObserver own values instead of pointers.

chrome/browser/ui/tabs/tab_strip_model_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 "chrome/browser/ui/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/file_path.h"
@@ skipping 244 matching lines @@
  private:
   content::TestBrowserThread browser_thread_;
 
   std::wstring test_dir_;
   std::wstring profile_path_;
 };
 
 class MockTabStripModelObserver : public TabStripModelObserver {
  public:
   MockTabStripModelObserver()
-      : empty_(true),
+      : states_deleter_(NULL),
+        empty_(true),
         model_(NULL) {}
   explicit MockTabStripModelObserver(TabStripModel* model)
-      : empty_(true),
+      : states_deleter_(&states_),
+        empty_(true),
         model_(model) {}
-  virtual ~MockTabStripModelObserver() {
-    STLDeleteContainerPointers(states_.begin(), states_.end());
-  }
+  virtual ~MockTabStripModelObserver() {}
 
   enum TabStripModelObserverAction {
     INSERT,
     CLOSE,
     DETACH,
     ACTIVATE,
     DEACTIVATE,
     SELECT,
     MOVE,
     CHANGE,
@@ skipping 107 matching lines @@
     states_.push_back(s);
   }
   virtual void TabPinnedStateChanged(TabContents* contents, int index) {
     states_.push_back(new State(contents, index, PINNED));
   }
   virtual void TabStripEmpty() {
     empty_ = true;
   }
 
   void ClearStates() {
-    STLDeleteContainerPointers(states_.begin(), states_.end());
-    states_.clear();
+    STLDeleteElements(&states_);
   }
 
   bool empty() const { return empty_; }
   TabStripModel* model() { return model_; }
 
  private:
   std::vector<State*> states_;

[sky, 2012/09/20 15:03:26]

If you're going to do anything, make this contain values rather than pointers.

[tfarina, 2012/09/21 01:18:55]

Done.

+  STLElementDeleter<std::vector<State*> > states_deleter_;
 
   bool empty_;
   TabStripModel* model_;
 
   DISALLOW_COPY_AND_ASSIGN(MockTabStripModelObserver);
 };
 
 TEST_F(TabStripModelTest, TestBasicAPI) {
   TabStripDummyDelegate delegate(NULL);
   TabStripModel tabstrip(&delegate, profile());
@@ skipping 2022 matching lines @@
   ASSERT_EQ(1, observer.GetStateCount());
   MockTabStripModelObserver::State s(
       contents2, 1, MockTabStripModelObserver::SELECT);
   s.src_contents = contents2;
   s.src_index = 1;
   s.user_gesture = false;
   EXPECT_TRUE(observer.StateEquals(0, s));
   strip.RemoveObserver(&observer);
   strip.CloseAllTabs();
 }