Remove ScopedVector from IDStores

net/extras/sqlite/sqlite_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/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "crypto/ec_private_key.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/asn1_util.h"
 #include "net/extras/sqlite/sqlite_channel_id_store.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/ssl_client_cert_type.h"
 #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"
 
 namespace net {
 
 const base::FilePath::CharType kTestChannelIDFilename[] =
     FILE_PATH_LITERAL("ChannelID");
 
 class SQLiteChannelIDStoreTest : public testing::Test {
  public:
-  void Load(ScopedVector<DefaultChannelIDStore::ChannelID>* channel_ids) {
+  void Load(
+      std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>>* channel_ids) {

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

include vector, scoped_ptr

     base::RunLoop run_loop;
     store_->Load(base::Bind(&SQLiteChannelIDStoreTest::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<DefaultChannelIDStore::ChannelID> > channel_ids) {
+      scoped_ptr<std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>>>
+          channel_ids) {
     channel_ids_.swap(*channel_ids);
     run_loop->Quit();
   }
 
  protected:
   static void ReadTestKeyAndCert(std::string* key_data,
                                  std::string* cert_data,
                                  scoped_ptr<crypto::ECPrivateKey>* key) {
     base::FilePath key_path =
         GetTestCertsDirectory().AppendASCII("unittest.originbound.key.der");
@@ skipping 41 matching lines @@
     exploded_time.second = 39;
     exploded_time.millisecond = 0;
     return base::Time::FromUTCExploded(exploded_time);
   }
 
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     store_ = new SQLiteChannelIDStore(
         temp_dir_.path().Append(kTestChannelIDFilename),
         base::ThreadTaskRunnerHandle::Get());
-    ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
+    std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>> channel_ids;
     Load(&channel_ids);
     ASSERT_EQ(0u, channel_ids.size());
     // Make sure the store gets written at least once.
     google_key_.reset(crypto::ECPrivateKey::Create());
     store_->AddChannelID(DefaultChannelIDStore::ChannelID(
         "google.com", base::Time::FromInternalValue(1),
         make_scoped_ptr(google_key_->Copy())));
   }
 
   base::ScopedTempDir temp_dir_;
   scoped_refptr<SQLiteChannelIDStore> store_;
-  ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids_;
+  std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>> channel_ids_;
   scoped_ptr<crypto::ECPrivateKey> google_key_;
 };
 
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLiteChannelIDStoreTest, TestPersistence) {
   scoped_ptr<crypto::ECPrivateKey> foo_key(crypto::ECPrivateKey::Create());
   store_->AddChannelID(DefaultChannelIDStore::ChannelID(
       "foo.com", base::Time::FromInternalValue(3),
       make_scoped_ptr(foo_key->Copy())));
 
-  ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
+  std::vector<scoped_ptr<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 SQLiteChannelIDStore(temp_dir_.path().Append(kTestChannelIDFilename),
                                base::ThreadTaskRunnerHandle::Get());
 
   // Reload and test for persistence
   Load(&channel_ids);
   ASSERT_EQ(2U, channel_ids.size());
-  DefaultChannelIDStore::ChannelID* goog_channel_id;
-  DefaultChannelIDStore::ChannelID* foo_channel_id;
+  scoped_ptr<DefaultChannelIDStore::ChannelID> goog_channel_id;
+  scoped_ptr<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]);
   } 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]);

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

Again, not sure this really gets us much.

   }
   ASSERT_EQ("google.com", goog_channel_id->server_identifier());
   EXPECT_TRUE(KeysEqual(google_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(KeysEqual(foo_key.get(), foo_channel_id->key()));
   ASSERT_EQ(3, foo_channel_id->creation_time().ToInternalValue());
 
   // Now delete the keypair and check persistence again.
-  store_->DeleteChannelID(*channel_ids[0]);
-  store_->DeleteChannelID(*channel_ids[1]);
+  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 SQLiteChannelIDStore(temp_dir_.path().Append(kTestChannelIDFilename),
                                base::ThreadTaskRunnerHandle::Get());
 
   // Reload and check if the keypair has been removed.
   Load(&channel_ids);
   ASSERT_EQ(0U, channel_ids.size());
   // Close the store.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
 }
 
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLiteChannelIDStoreTest, TestDeleteAll) {
   store_->AddChannelID(DefaultChannelIDStore::ChannelID(
       "foo.com", base::Time::FromInternalValue(3),
       make_scoped_ptr(crypto::ECPrivateKey::Create())));
 
-  ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
+  std::vector<scoped_ptr<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 SQLiteChannelIDStore(temp_dir_.path().Append(kTestChannelIDFilename),
                                base::ThreadTaskRunnerHandle::Get());
 
@@ skipping 61 matching lines @@
         "INSERT INTO \"origin_bound_certs\" VALUES("
         "'foo.com',X'AA',X'BB');"));
   }
 
   // Load and test the DB contents twice.  First time ensures that we can use
   // the updated values immediately.  Second time ensures that the updated
   // values are stored and read correctly on next load.
   for (int i = 0; i < 2; ++i) {
     SCOPED_TRACE(i);
 
-    ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
+    std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>> channel_ids;
     store_ = new SQLiteChannelIDStore(v1_db_path,
                                       base::ThreadTaskRunnerHandle::Get());
 
     // Load the database. Because the existing v1 certs are implicitly of type
     // RSA, which is unsupported, they're discarded.
     Load(&channel_ids);
     ASSERT_EQ(0U, channel_ids.size());
 
     store_ = NULL;
     base::RunLoop().RunUntilIdle();
@@ skipping 51 matching lines @@
         "INSERT INTO \"origin_bound_certs\" VALUES("
         "'foo.com',X'AA',X'BB',64);"));
   }
 
   // Load and test the DB contents twice.  First time ensures that we can use
   // the updated values immediately.  Second time ensures that the updated
   // values are saved and read correctly on next load.
   for (int i = 0; i < 2; ++i) {
     SCOPED_TRACE(i);
 
-    ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
+    std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>> channel_ids;
     store_ = new SQLiteChannelIDStore(v2_db_path,
                                       base::ThreadTaskRunnerHandle::Get());
 
     // Load the database and ensure the certs can be read.
     Load(&channel_ids);
     ASSERT_EQ(1U, channel_ids.size());
 
     ASSERT_EQ("google.com", channel_ids[0]->server_identifier());
     ASSERT_EQ(GetTestCertCreationTime(), channel_ids[0]->creation_time());
     EXPECT_TRUE(KeysEqual(key.get(), channel_ids[0]->key()));
@@ skipping 57 matching lines @@
         "INSERT INTO \"origin_bound_certs\" VALUES("
         "'foo.com',X'AA',X'BB',64,2000);"));
   }
 
   // Load and test the DB contents twice.  First time ensures that we can use
   // the updated values immediately.  Second time ensures that the updated
   // values are saved and read correctly on next load.
   for (int i = 0; i < 2; ++i) {
     SCOPED_TRACE(i);
 
-    ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
+    std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>> channel_ids;
     store_ = new SQLiteChannelIDStore(v3_db_path,
                                       base::ThreadTaskRunnerHandle::Get());
 
     // Load the database and ensure the certs can be read.
     Load(&channel_ids);
     ASSERT_EQ(1U, channel_ids.size());
 
     ASSERT_EQ("google.com", channel_ids[0]->server_identifier());
     ASSERT_EQ(GetTestCertCreationTime(), channel_ids[0]->creation_time());
     EXPECT_TRUE(KeysEqual(key.get(), channel_ids[0]->key()));
@@ skipping 73 matching lines @@
         "INSERT INTO \"origin_bound_certs\" VALUES("
         "'bar.com',X'AA',X'BB',64,2000,3000);"));
   }
 
   // Load and test the DB contents twice.  First time ensures that we can use
   // the updated values immediately.  Second time ensures that the updated
   // values are saved and read correctly on next load.
   for (int i = 0; i < 2; ++i) {
     SCOPED_TRACE(i);
 
-    ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
+    std::vector<scoped_ptr<DefaultChannelIDStore::ChannelID>> channel_ids;
     store_ = new SQLiteChannelIDStore(v4_db_path,
                                       base::ThreadTaskRunnerHandle::Get());
 
     // Load the database and ensure the certs can be read.
     Load(&channel_ids);
     ASSERT_EQ(1U, channel_ids.size());
 
     ASSERT_EQ("google.com", channel_ids[0]->server_identifier());
     ASSERT_EQ(GetTestCertCreationTime(), channel_ids[0]->creation_time());
     EXPECT_TRUE(KeysEqual(key.get(), channel_ids[0]->key()));
 
     store_ = NULL;
     // Make sure we wait until the destructor has run.
     base::RunLoop().RunUntilIdle();
 
     // Verify the database version is updated.
     {
       sql::Connection db;
       ASSERT_TRUE(db.Open(v4_db_path));
       sql::Statement smt(db.GetUniqueStatement(
           "SELECT value FROM meta WHERE key = \"version\""));
       ASSERT_TRUE(smt.Step());
       EXPECT_EQ(5, smt.ColumnInt(0));
       EXPECT_FALSE(smt.Step());
     }
   }
 }
 
 }  // namespace net