Remove ScopedVector from IDStores

chrome/browser/net/quota_policy_channel_id_store_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 11 matching lines @@
 #include "net/test/cert_test_util.h"
 #include "net/test/channel_id_test_util.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const base::FilePath::CharType kTestChannelIDFilename[] =
     FILE_PATH_LITERAL("ChannelID");
 
 class QuotaPolicyChannelIDStoreTest : public testing::Test {
  public:
-  void Load(ScopedVector<net::DefaultChannelIDStore::ChannelID>* channel_ids) {
+  void Load(std::vector<scoped_ptr<net::DefaultChannelIDStore::ChannelID>>*

[mmenke, 2015/11/30 20:33:16]

include <vector>

+                channel_ids) {
     base::RunLoop run_loop;
     store_->Load(base::Bind(&QuotaPolicyChannelIDStoreTest::OnLoaded,
                             base::Unretained(this),
                             &run_loop));
     run_loop.Run();
     channel_ids->swap(channel_ids_);
     channel_ids_.clear();
   }
 
-  void OnLoaded(base::RunLoop* run_loop,
-                scoped_ptr<ScopedVector<net::DefaultChannelIDStore::ChannelID> >
-                    channel_ids) {
+  void OnLoaded(
+      base::RunLoop* run_loop,
+      scoped_ptr<std::vector<scoped_ptr<net::DefaultChannelIDStore::ChannelID>>>
+          channel_ids) {
     channel_ids_.swap(*channel_ids);
     run_loop->Quit();
   }
 
  protected:
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     store_ = new QuotaPolicyChannelIDStore(
         temp_dir_.path().Append(kTestChannelIDFilename),
         base::ThreadTaskRunnerHandle::Get(),
         NULL);
-    ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids;
+    std::vector<scoped_ptr<net::DefaultChannelIDStore::ChannelID>> channel_ids;
     Load(&channel_ids);
     ASSERT_EQ(0u, channel_ids.size());
   }
 
   void TearDown() override {
     store_ = NULL;
     loop_.RunUntilIdle();
   }
 
   base::ScopedTempDir temp_dir_;
   scoped_refptr<QuotaPolicyChannelIDStore> store_;
-  ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids_;
+  std::vector<scoped_ptr<net::DefaultChannelIDStore::ChannelID>> channel_ids_;
   base::MessageLoop loop_;
 };
 
 // Test if data is stored as expected in the QuotaPolicy database.
 TEST_F(QuotaPolicyChannelIDStoreTest, TestPersistence) {
   scoped_ptr<crypto::ECPrivateKey> goog_key(crypto::ECPrivateKey::Create());
   scoped_ptr<crypto::ECPrivateKey> foo_key(crypto::ECPrivateKey::Create());
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "google.com", base::Time::FromInternalValue(1),
       make_scoped_ptr(goog_key->Copy())));
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "foo.com", base::Time::FromInternalValue(3),
       make_scoped_ptr(foo_key->Copy())));
 
-  ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids;
+  std::vector<scoped_ptr<net::DefaultChannelIDStore::ChannelID>> channel_ids;
   // Replace the store effectively destroying the current one and forcing it
   // to write its data to disk. Then we can see if after loading it again it
   // is still there.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
   store_ = new QuotaPolicyChannelIDStore(
       temp_dir_.path().Append(kTestChannelIDFilename),
       base::ThreadTaskRunnerHandle::Get(),
       NULL);
 
   // Reload and test for persistence
   Load(&channel_ids);
   ASSERT_EQ(2U, channel_ids.size());
-  net::DefaultChannelIDStore::ChannelID* goog_channel_id;
-  net::DefaultChannelIDStore::ChannelID* foo_channel_id;
+  scoped_ptr<net::DefaultChannelIDStore::ChannelID> goog_channel_id;
+  scoped_ptr<net::DefaultChannelIDStore::ChannelID> foo_channel_id;
   if (channel_ids[0]->server_identifier() == "google.com") {
-    goog_channel_id = channel_ids[0];
-    foo_channel_id = channel_ids[1];
+    goog_channel_id = std::move(channel_ids[0]);
+    foo_channel_id = std::move(channel_ids[1]);

[mmenke, 2015/11/30 20:33:16]

Any reason for passing ownership here?  Doesn't seem like it gets us much.

   } else {
-    goog_channel_id = channel_ids[1];
-    foo_channel_id = channel_ids[0];
+    goog_channel_id = std::move(channel_ids[1]);
+    foo_channel_id = std::move(channel_ids[0]);
   }
   ASSERT_EQ("google.com", goog_channel_id->server_identifier());
   EXPECT_TRUE(net::KeysEqual(goog_key.get(), goog_channel_id->key()));
   ASSERT_EQ(1, goog_channel_id->creation_time().ToInternalValue());
   ASSERT_EQ("foo.com", foo_channel_id->server_identifier());
   EXPECT_TRUE(net::KeysEqual(foo_key.get(), foo_channel_id->key()));
   ASSERT_EQ(3, foo_channel_id->creation_time().ToInternalValue());
 
-  // Now delete the channel ID and check persistence again.
-  store_->DeleteChannelID(*channel_ids[0]);
-  store_->DeleteChannelID(*channel_ids[1]);
+  //  Now delete the channel ID and check persistence again.

[mmenke, 2015/11/30 20:33:16]

Remove extra space.

+  store_->DeleteChannelID(*goog_channel_id);
+  store_->DeleteChannelID(*foo_channel_id);
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
   channel_ids.clear();
   store_ = new QuotaPolicyChannelIDStore(
       temp_dir_.path().Append(kTestChannelIDFilename),
       base::ThreadTaskRunnerHandle::Get(),
       NULL);
 
   // Reload and check if the channel ID has been removed.
   Load(&channel_ids);
   ASSERT_EQ(0U, channel_ids.size());
 }
 
 // Test if data is stored as expected in the QuotaPolicy database.
 TEST_F(QuotaPolicyChannelIDStoreTest, TestPolicy) {
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "google.com", base::Time::FromInternalValue(1),
       make_scoped_ptr(crypto::ECPrivateKey::Create())));
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "nonpersistent.com", base::Time::FromInternalValue(3),
       make_scoped_ptr(crypto::ECPrivateKey::Create())));
 
-  ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids;
+  std::vector<scoped_ptr<net::DefaultChannelIDStore::ChannelID>> channel_ids;
   // Replace the store effectively destroying the current one and forcing it
   // to write its data to disk. Then we can see if after loading it again it
   // is still there.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
   // Specify storage policy that makes "nonpersistent.com" session only.
   scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
       new content::MockSpecialStoragePolicy();
   storage_policy->AddSessionOnly(
@@ skipping 29 matching lines @@
       base::ThreadTaskRunnerHandle::Get(),
       NULL);
 
   // Reload and check that the nonpersistent.com channel IDs have been removed.
   Load(&channel_ids);
   ASSERT_EQ(2U, channel_ids.size());
   for (const auto& id : channel_ids) {
     ASSERT_NE("nonpersistent.com", id->server_identifier());
   }
 }