Remove stl_util's deletion function use and ScopedVector from chrome/browser/download/.

chrome/browser/download/download_query_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/download/download_query.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/public/test/mock_download_item.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
 using ::testing::ReturnRef;
@@ skipping 23 matching lines @@
 }
 
 }  // anonymous namespace
 
 class DownloadQueryTest : public testing::Test {
  public:
   DownloadQueryTest() {}
 
   ~DownloadQueryTest() override {}
 
-  void TearDown() override { base::STLDeleteElements(&mocks_); }
+  void TearDown() override {}
 
   void CreateMocks(int count) {
     for (int i = 0; i < count; ++i) {
-      mocks_.push_back(new content::MockDownloadItem());
+      owned_mocks_.push_back(base::MakeUnique<content::MockDownloadItem>());
+      mocks_.push_back(owned_mocks_.back().get());
       EXPECT_CALL(mock(mocks_.size() - 1), GetId()).WillRepeatedly(Return(
           mocks_.size() - 1));
     }
   }
 
   content::MockDownloadItem& mock(int index) { return *mocks_[index]; }
 
   DownloadQuery* query() { return &query_; }
 
   template<typename ValueType> void AddFilter(
@@ skipping 17 matching lines @@
   // ascending. In order to test that a sorter distinguishes between two items,
   // the sorter must sort them by ID descending.
   void ExpectSortInverted() {
     Search();
     ASSERT_EQ(2U, results()->size());
     ASSERT_EQ(1U, results()->at(0)->GetId());
     ASSERT_EQ(0U, results()->at(1)->GetId());
   }
 
  private:
   std::vector<content::MockDownloadItem*> mocks_;

[sky, 2016/10/28 13:33:59]

It's unfortunate that two vectors with the same thing are necessary here. Please
add a comment.

[Avi (use Gerrit), 2016/10/28 14:04:10]

Done.

+  std::vector<std::unique_ptr<content::MockDownloadItem>> owned_mocks_;
   DownloadQuery query_;
   DownloadVector results_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadQueryTest);
 };
 
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, bool cpp_value) {
   std::unique_ptr<base::Value> value(new base::FundamentalValue(cpp_value));
   CHECK(query_.AddFilter(name, *value.get()));
@@ skipping 672 matching lines @@
   base::Time start = base::Time::Now();
   Search();
   base::Time end = base::Time::Now();
   double nanos = (end - start).InMillisecondsF() * 1000.0 * 1000.0;
   double nanos_per_item = nanos / static_cast<double>(kNumItems);
   double nanos_per_item_per_filter = nanos_per_item
     / static_cast<double>(kNumFilters);
   std::cout << "Search took " << nanos_per_item_per_filter
             << " nanoseconds per item per filter.\n";
 }