BrowserContext should simply own DownloadManager

content/browser/download/download_id_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 "content/public/browser/download_id.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/public/test/mock_download_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class DownloadIdTest : public testing::Test {
  public:
   DownloadIdTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {
-    num_managers_ = ARRAYSIZE_UNSAFE(download_managers_);
-    std::vector<MockDownloadManager*> managers;
-    managers.resize(num_managers_);
-    size_t i;
-    // Create the download managers.
-    for (i = 0; i < num_managers_; ++i) {
-      managers[i] = new MockDownloadManager();
+    const size_t num_managers_ = 2;
+    for (size_t i = 0; i < num_managers_; ++i) {
+      download_managers_.push_back(new MockDownloadManager());
     }
+
     // Sort by pointer value.
-    std::sort(managers.begin(), managers.end());
-    // Assign to |download_managers_|.
-    for (i = 0; i < num_managers_; ++i) {
-      download_managers_[i] = managers[i];
-      managers[i] = NULL;
-    }
-  }
-
-  virtual ~DownloadIdTest() {
-    for (size_t i = 0; i < num_managers_; ++i)
-      download_managers_[i] = NULL;  // Releases & deletes.
+    std::sort(download_managers_.begin(), download_managers_.end());
   }
 
  protected:
-  scoped_refptr<DownloadManager> download_managers_[2];
+  ScopedVector<DownloadManager> download_managers_;
   base::MessageLoopForUI message_loop_;
   // Necessary to delete |DownloadManager|s.
   BrowserThreadImpl ui_thread_;
-  size_t num_managers_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadIdTest);
 };
 
 TEST_F(DownloadIdTest, Local) {
   DownloadId id1(download_managers_[0], 23);
   DownloadId id2(download_managers_[0], 25);
 
   EXPECT_EQ(23, id1.local());
   EXPECT_EQ(25, id2.local());
@@ skipping 21 matching lines @@
 TEST_F(DownloadIdTest, NotEqualsIndex) {
   DownloadId id1(download_managers_[0], 23);
   DownloadId id2(download_managers_[0], 24);
 
   EXPECT_FALSE(id1 == id2);
   EXPECT_LT(id1, id2);
 }
 
 TEST_F(DownloadIdTest, NotEqualsManager) {
   // Because it's sorted above, &download_managers_[1] > &download_managers_[0].
-  EXPECT_LT(download_managers_[0].get(), download_managers_[1].get());
+  EXPECT_LT(download_managers_[0], download_managers_[1]);
   DownloadId id1(download_managers_[0], 23);
   DownloadId id2(download_managers_[1], 23);
   DownloadId id3(download_managers_[1], 22);
 
   EXPECT_LT(DownloadId::Invalid(), id1);
   EXPECT_LT(DownloadId::Invalid(), id2);
   EXPECT_LT(DownloadId::Invalid(), id3);
 
   EXPECT_FALSE(id1 == id2);
   EXPECT_LT(id1, id2);
@@ skipping 39 matching lines @@
   last = map.end();
   EXPECT_FALSE(last == map.find(id1));
   EXPECT_FALSE(last == map.find(id2));
   EXPECT_FALSE(last == map.find(id3));
 
   EXPECT_FALSE(id1 == id2);
   EXPECT_LT(id1, id2);
 }
 
 }  // namespace content