Update monet.

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/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "net/base/test_data_directory.h"
 #include "net/extras/sqlite/sqlite_channel_id_store.h"
 #include "net/ssl/ssl_client_cert_type.h"
 #include "net/test/cert_test_util.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 const base::FilePath::CharType kTestChannelIDFilename[] =
@@ skipping 47 matching lines @@
     exploded_time.minute = 23;
     exploded_time.second = 45;
     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::MessageLoopProxy::current());
+        base::ThreadTaskRunnerHandle::Get());
     ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
     Load(&channel_ids);
     ASSERT_EQ(0u, channel_ids.size());
     // Make sure the store gets written at least once.
     store_->AddChannelID(
         DefaultChannelIDStore::ChannelID("google.com",
                                          base::Time::FromInternalValue(1),
                                          base::Time::FromInternalValue(2),
                                          "a",
                                          "b"));
@@ skipping 15 matching lines @@
 
   ScopedVector<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::MessageLoopProxy::current());
+                               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;
   if (channel_ids[0]->server_identifier() == "google.com") {
     goog_channel_id = channel_ids[0];
     foo_channel_id = channel_ids[1];
   } else {
@@ skipping 13 matching lines @@
 
   // Now delete the cert and check persistence again.
   store_->DeleteChannelID(*channel_ids[0]);
   store_->DeleteChannelID(*channel_ids[1]);
   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::MessageLoopProxy::current());
+                               base::ThreadTaskRunnerHandle::Get());
 
   // Reload and check if the cert 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),
                                        base::Time::FromInternalValue(4),
                                        "c",
                                        "d"));
 
   ScopedVector<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::MessageLoopProxy::current());
+                               base::ThreadTaskRunnerHandle::Get());
 
   // Reload and test for persistence
   Load(&channel_ids);
   ASSERT_EQ(2U, channel_ids.size());
   // DeleteAll except foo.com (shouldn't fail if one is missing either).
   std::list<std::string> delete_server_identifiers;
   delete_server_identifiers.push_back("google.com");
   delete_server_identifiers.push_back("missing.com");
   store_->DeleteAllInList(delete_server_identifiers);
 
   // Now check persistence again.
   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::MessageLoopProxy::current());
+                               base::ThreadTaskRunnerHandle::Get());
 
   // Reload and check that only foo.com persisted in store.
   Load(&channel_ids);
   ASSERT_EQ(1U, channel_ids.size());
   ASSERT_EQ("foo.com", channel_ids[0]->server_identifier());
   // Close the store.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
 }
@@ skipping 34 matching lines @@
         "'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;
-    store_ =
-        new SQLiteChannelIDStore(v1_db_path, base::MessageLoopProxy::current());
+    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();
 
     // Verify the database version is updated.
@@ skipping 48 matching lines @@
         "'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;
-    store_ =
-        new SQLiteChannelIDStore(v2_db_path, base::MessageLoopProxy::current());
+    store_ = new SQLiteChannelIDStore(v2_db_path,
+                                      base::ThreadTaskRunnerHandle::Get());
 
     // Load the database and ensure the certs can be read.
     Load(&channel_ids);
     ASSERT_EQ(2U, channel_ids.size());
 
     ASSERT_EQ("google.com", channel_ids[0]->server_identifier());
     ASSERT_EQ(GetTestCertExpirationTime(), channel_ids[0]->expiration_time());
     ASSERT_EQ(key_data, channel_ids[0]->private_key());
     ASSERT_EQ(cert_data, channel_ids[0]->cert());
 
@@ skipping 61 matching lines @@
         "'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;
-    store_ =
-        new SQLiteChannelIDStore(v3_db_path, base::MessageLoopProxy::current());
+    store_ = new SQLiteChannelIDStore(v3_db_path,
+                                      base::ThreadTaskRunnerHandle::Get());
 
     // Load the database and ensure the certs can be read.
     Load(&channel_ids);
     ASSERT_EQ(2U, channel_ids.size());
 
     ASSERT_EQ("google.com", channel_ids[0]->server_identifier());
     ASSERT_EQ(1000, channel_ids[0]->expiration_time().ToInternalValue());
     ASSERT_EQ(GetTestCertCreationTime(), channel_ids[0]->creation_time());
     ASSERT_EQ(key_data, channel_ids[0]->private_key());
     ASSERT_EQ(cert_data, channel_ids[0]->cert());
@@ skipping 70 matching lines @@
     add_smt.BindBlob(1, key_data.data(), key_data.size());
     add_smt.BindBlob(2, cert_data.data(), cert_data.size());
     add_smt.BindInt64(3, 1);
     add_smt.BindInt64(4, GetTestCertExpirationTime().ToInternalValue());
     add_smt.BindInt64(5, base::Time::Now().ToInternalValue());
     ASSERT_TRUE(add_smt.Run());
   }
 
   ScopedVector<DefaultChannelIDStore::ChannelID> channel_ids;
   store_ =
-      new SQLiteChannelIDStore(v4_db_path, base::MessageLoopProxy::current());
+      new SQLiteChannelIDStore(v4_db_path, base::ThreadTaskRunnerHandle::Get());
 
   // Load the database and ensure the certs can be read.
   Load(&channel_ids);
   // Only the ECDSA cert (for google.com) is read, the RSA one is discarded.
   ASSERT_EQ(1U, channel_ids.size());
 
   ASSERT_EQ("google.com", channel_ids[0]->server_identifier());
   ASSERT_EQ(GetTestCertExpirationTime(), channel_ids[0]->expiration_time());
   ASSERT_EQ(key_data, channel_ids[0]->private_key());
   ASSERT_EQ(cert_data, channel_ids[0]->cert());
 
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace net