Move sqlite_channel_id_store from chrome/browser/net to net/extras.

net/sqlite/sqlite_server_bound_cert_store_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 "base/bind.h"
 #include "base/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 "chrome/browser/net/sqlite_server_bound_cert_store.h"
-#include "chrome/common/chrome_constants.h"
-#include "content/public/test/mock_special_storage_policy.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/test_data_directory.h"
+#include "net/sqlite/sqlite_server_bound_cert_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 kTestOBCertFilename[] =
+    FILE_PATH_LITERAL("Origin Bound Certs");

[Ryan Sleevi, 2014/07/10 20:20:25]

pedantry: Doesn't need this constant, does it? You should just be able to use
temp_dir_ directly.

[mef, 2014/07/11 13:29:24]

Um, not sure I understand. SQLiteServerBoundCertStore takes path to the file,
not to directory.

[Ryan Sleevi, 2014/07/14 19:18:04]

Acknowledged.

+
 class SQLiteServerBoundCertStoreTest : public testing::Test {
  public:
   void Load(
       ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert>* certs) {
     base::RunLoop run_loop;
     store_->Load(base::Bind(&SQLiteServerBoundCertStoreTest::OnLoaded,
                             base::Unretained(this),
                             &run_loop));
     run_loop.Run();
     certs->swap(certs_);
@@ skipping 36 matching lines @@
     exploded_time.hour = 2;
     exploded_time.minute = 23;
     exploded_time.second = 45;
     exploded_time.millisecond = 0;
     return base::Time::FromUTCExploded(exploded_time);
   }
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     store_ = new SQLiteServerBoundCertStore(
-        temp_dir_.path().Append(chrome::kOBCertFilename),
+        temp_dir_.path().Append(kTestOBCertFilename),
         base::MessageLoopProxy::current(),
         NULL);
     ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert> certs;
     Load(&certs);
     ASSERT_EQ(0u, certs.size());
     // Make sure the store gets written at least once.
     store_->AddServerBoundCert(
         net::DefaultServerBoundCertStore::ServerBoundCert(
             "google.com",
             base::Time::FromInternalValue(1),
             base::Time::FromInternalValue(2),
             "a", "b"));
   }
 
-  content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_dir_;
   scoped_refptr<SQLiteServerBoundCertStore> store_;
   ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert> certs_;
 };
 
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLiteServerBoundCertStoreTest, TestPersistence) {
   store_->AddServerBoundCert(
       net::DefaultServerBoundCertStore::ServerBoundCert(
           "foo.com",
           base::Time::FromInternalValue(3),
           base::Time::FromInternalValue(4),
           "c", "d"));
 
   ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert> certs;
   // 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 SQLiteServerBoundCertStore(
-      temp_dir_.path().Append(chrome::kOBCertFilename),
+      temp_dir_.path().Append(kTestOBCertFilename),
       base::MessageLoopProxy::current(),
       NULL);
 
   // Reload and test for persistence
   Load(&certs);
   ASSERT_EQ(2U, certs.size());
   net::DefaultServerBoundCertStore::ServerBoundCert* goog_cert;
   net::DefaultServerBoundCertStore::ServerBoundCert* foo_cert;
   if (certs[0]->server_identifier() == "google.com") {
     goog_cert = certs[0];
@@ skipping 14 matching lines @@
   ASSERT_EQ(4, foo_cert->expiration_time().ToInternalValue());
 
   // Now delete the cert and check persistence again.
   store_->DeleteServerBoundCert(*certs[0]);
   store_->DeleteServerBoundCert(*certs[1]);
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
   certs.clear();
   store_ = new SQLiteServerBoundCertStore(
-      temp_dir_.path().Append(chrome::kOBCertFilename),
+      temp_dir_.path().Append(kTestOBCertFilename),
       base::MessageLoopProxy::current(),
       NULL);
 
   // Reload and check if the cert has been removed.
   Load(&certs);
   ASSERT_EQ(0U, certs.size());
 }
 
 TEST_F(SQLiteServerBoundCertStoreTest, TestUpgradeV1) {
   // Reset the store.  We'll be using a different database for this test.
@@ skipping 301 matching lines @@
   ASSERT_EQ("google.com", certs[0]->server_identifier());
   ASSERT_EQ(GetTestCertExpirationTime(),
             certs[0]->expiration_time());
   ASSERT_EQ(key_data, certs[0]->private_key());
   ASSERT_EQ(cert_data, certs[0]->cert());
 
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
 }
+
+}  // namespace net