Change Origin bound certs -> Domain bound certs.

chrome/browser/net/sqlite_origin_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/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 50 matching lines @@
     db_thread_.Start();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     store_ = new SQLiteOriginBoundCertStore(
         temp_dir_.path().Append(chrome::kOBCertFilename));
     ScopedVector<net::DefaultOriginBoundCertStore::OriginBoundCert> certs;
     ASSERT_TRUE(store_->Load(&certs.get()));
     ASSERT_EQ(0u, certs.size());
     // Make sure the store gets written at least once.
     store_->AddOriginBoundCert(
         net::DefaultOriginBoundCertStore::OriginBoundCert(
-            "https://encrypted.google.com:8443",
+            "google.com",
             net::CLIENT_CERT_RSA_SIGN,
             base::Time::FromInternalValue(1),
             base::Time::FromInternalValue(2),
             "a", "b"));
   }
 
   content::TestBrowserThread db_thread_;
   ScopedTempDir temp_dir_;
   scoped_refptr<SQLiteOriginBoundCertStore> store_;
 };
@@ skipping 26 matching lines @@
   ASSERT_TRUE(helper->Run());
 
   ASSERT_FALSE(file_util::PathExists(
       temp_dir_.path().Append(chrome::kOBCertFilename)));
 }
 
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLiteOriginBoundCertStoreTest, TestPersistence) {
   store_->AddOriginBoundCert(
       net::DefaultOriginBoundCertStore::OriginBoundCert(
-          "https://www.google.com/",
+          "foo.com",
           net::CLIENT_CERT_ECDSA_SIGN,
           base::Time::FromInternalValue(3),
           base::Time::FromInternalValue(4),
           "c", "d"));
 
   ScopedVector<net::DefaultOriginBoundCertStore::OriginBoundCert> certs;
   // Replace the store effectively destroying the current one and forcing it
   // to write it's data to disk. Then we can see if after loading it again it
   // is still there.
   store_ = NULL;
@@ skipping 10 matching lines @@
   ASSERT_EQ(2U, certs.size());
   net::DefaultOriginBoundCertStore::OriginBoundCert* ec_cert;
   net::DefaultOriginBoundCertStore::OriginBoundCert* rsa_cert;
   if (net::CLIENT_CERT_RSA_SIGN == certs[0]->type()) {
     rsa_cert = certs[0];
     ec_cert = certs[1];
   } else {
     rsa_cert = certs[1];
     ec_cert = certs[0];
   }
-  ASSERT_STREQ("https://encrypted.google.com:8443", rsa_cert->origin().c_str());
+  ASSERT_STREQ("google.com", rsa_cert->domain().c_str());
   ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, rsa_cert->type());
   ASSERT_STREQ("a", rsa_cert->private_key().c_str());
   ASSERT_STREQ("b", rsa_cert->cert().c_str());
   ASSERT_EQ(1, rsa_cert->creation_time().ToInternalValue());
   ASSERT_EQ(2, rsa_cert->expiration_time().ToInternalValue());
-  ASSERT_STREQ("https://www.google.com/", ec_cert->origin().c_str());
+  ASSERT_STREQ("foo.com", ec_cert->domain().c_str());
   ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, ec_cert->type());
   ASSERT_STREQ("c", ec_cert->private_key().c_str());
   ASSERT_STREQ("d", ec_cert->cert().c_str());
   ASSERT_EQ(3, ec_cert->creation_time().ToInternalValue());
   ASSERT_EQ(4, ec_cert->expiration_time().ToInternalValue());
 
   // Now delete the cert and check persistence again.
   store_->DeleteOriginBoundCert(*certs[0]);
   store_->DeleteOriginBoundCert(*certs[1]);
   store_ = NULL;
@@ skipping 27 matching lines @@
             "value LONGVARCHAR);"
         "INSERT INTO \"meta\" VALUES('version','1');"
         "INSERT INTO \"meta\" VALUES('last_compatible_version','1');"
         "CREATE TABLE origin_bound_certs ("
             "origin TEXT NOT NULL UNIQUE PRIMARY KEY,"
             "private_key BLOB NOT NULL,cert BLOB NOT NULL);"));
 
     sql::Statement add_smt(db.GetUniqueStatement(
         "INSERT INTO origin_bound_certs (origin, private_key, cert) "
         "VALUES (?,?,?)"));
-    add_smt.BindString(0, "https://www.google.com:443");
+    add_smt.BindString(0, "google.com");
     add_smt.BindBlob(1, key_data.data(), key_data.size());
     add_smt.BindBlob(2, cert_data.data(), cert_data.size());
     ASSERT_TRUE(add_smt.Run());
 
     ASSERT_TRUE(db.Execute(
         "INSERT INTO \"origin_bound_certs\" VALUES("
-            "'https://foo.com',X'AA',X'BB');"
+            "'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<net::DefaultOriginBoundCertStore::OriginBoundCert> certs;
     store_ = new SQLiteOriginBoundCertStore(v1_db_path);
 
     // Load the database and ensure the certs can be read and are marked as RSA.
     ASSERT_TRUE(store_->Load(&certs.get()));
     ASSERT_EQ(2U, certs.size());
 
-    ASSERT_STREQ("https://www.google.com:443", certs[0]->origin().c_str());
+    ASSERT_STREQ("google.com", certs[0]->domain().c_str());
     ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[0]->type());
     ASSERT_EQ(GetTestCertExpirationTime(),
               certs[0]->expiration_time());
     ASSERT_EQ(key_data, certs[0]->private_key());
     ASSERT_EQ(cert_data, certs[0]->cert());
 
-    ASSERT_STREQ("https://foo.com", certs[1]->origin().c_str());
+    ASSERT_STREQ("foo.com", certs[1]->domain().c_str());
     ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[1]->type());
     // Undecodable cert, expiration time will be uninitialized.
     ASSERT_EQ(base::Time(), certs[1]->expiration_time());
     ASSERT_STREQ("\xaa", certs[1]->private_key().c_str());
     ASSERT_STREQ("\xbb", certs[1]->cert().c_str());
 
     store_ = NULL;
     // Make sure we wait until the destructor has run.
     scoped_refptr<base::ThreadTestHelper> helper(
         new base::ThreadTestHelper(
@@ skipping 35 matching lines @@
         "CREATE TABLE origin_bound_certs ("
             "origin TEXT NOT NULL UNIQUE PRIMARY KEY,"
             "private_key BLOB NOT NULL,"
             "cert BLOB NOT NULL,"
             "cert_type INTEGER);"
         ));
 
     sql::Statement add_smt(db.GetUniqueStatement(
         "INSERT INTO origin_bound_certs (origin, private_key, cert, cert_type) "
         "VALUES (?,?,?,?)"));
-    add_smt.BindString(0, "https://www.google.com:443");
+    add_smt.BindString(0, "google.com");
     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);
     ASSERT_TRUE(add_smt.Run());
 
     ASSERT_TRUE(db.Execute(
         "INSERT INTO \"origin_bound_certs\" VALUES("
-            "'https://foo.com',X'AA',X'BB',64);"
+            "'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<net::DefaultOriginBoundCertStore::OriginBoundCert> certs;
     store_ = new SQLiteOriginBoundCertStore(v2_db_path);
 
     // Load the database and ensure the certs can be read and are marked as RSA.
     ASSERT_TRUE(store_->Load(&certs.get()));
     ASSERT_EQ(2U, certs.size());
 
-    ASSERT_STREQ("https://www.google.com:443", certs[0]->origin().c_str());
+    ASSERT_STREQ("google.com", certs[0]->domain().c_str());
     ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[0]->type());
     ASSERT_EQ(GetTestCertExpirationTime(),
               certs[0]->expiration_time());
     ASSERT_EQ(key_data, certs[0]->private_key());
     ASSERT_EQ(cert_data, certs[0]->cert());
 
-    ASSERT_STREQ("https://foo.com", certs[1]->origin().c_str());
+    ASSERT_STREQ("foo.com", certs[1]->domain().c_str());
     ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, certs[1]->type());
     // Undecodable cert, expiration time will be uninitialized.
     ASSERT_EQ(base::Time(), certs[1]->expiration_time());
     ASSERT_STREQ("\xaa", certs[1]->private_key().c_str());
     ASSERT_STREQ("\xbb", certs[1]->cert().c_str());
 
     store_ = NULL;
     // Make sure we wait until the destructor has run.
     scoped_refptr<base::ThreadTestHelper> helper(
         new base::ThreadTestHelper(
@@ skipping 36 matching lines @@
             "origin TEXT NOT NULL UNIQUE PRIMARY KEY,"
             "private_key BLOB NOT NULL,"
             "cert BLOB NOT NULL,"
             "cert_type INTEGER,"
             "expiration_time INTEGER);"
         ));
 
     sql::Statement add_smt(db.GetUniqueStatement(
         "INSERT INTO origin_bound_certs (origin, private_key, cert, cert_type, "
         "expiration_time) VALUES (?,?,?,?,?)"));
-    add_smt.BindString(0, "https://www.google.com:443");
+    add_smt.BindString(0, "google.com");
     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, 1000);
     ASSERT_TRUE(add_smt.Run());
 
     ASSERT_TRUE(db.Execute(
         "INSERT INTO \"origin_bound_certs\" VALUES("
-            "'https://foo.com',X'AA',X'BB',64,2000);"
+            "'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<net::DefaultOriginBoundCertStore::OriginBoundCert> certs;
     store_ = new SQLiteOriginBoundCertStore(v3_db_path);
 
     // Load the database and ensure the certs can be read and are marked as RSA.
     ASSERT_TRUE(store_->Load(&certs.get()));
     ASSERT_EQ(2U, certs.size());
 
-    ASSERT_STREQ("https://www.google.com:443", certs[0]->origin().c_str());
+    ASSERT_STREQ("google.com", certs[0]->domain().c_str());
     ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[0]->type());
     ASSERT_EQ(1000, certs[0]->expiration_time().ToInternalValue());
     ASSERT_EQ(GetTestCertCreationTime(),
               certs[0]->creation_time());
     ASSERT_EQ(key_data, certs[0]->private_key());
     ASSERT_EQ(cert_data, certs[0]->cert());
 
-    ASSERT_STREQ("https://foo.com", certs[1]->origin().c_str());
+    ASSERT_STREQ("foo.com", certs[1]->domain().c_str());
     ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, certs[1]->type());
     ASSERT_EQ(2000, certs[1]->expiration_time().ToInternalValue());
     // Undecodable cert, creation time will be uninitialized.
     ASSERT_EQ(base::Time(), certs[1]->creation_time());
     ASSERT_STREQ("\xaa", certs[1]->private_key().c_str());
     ASSERT_STREQ("\xbb", certs[1]->cert().c_str());
 
     store_ = NULL;
     // Make sure we wait until the destructor has run.
     scoped_refptr<base::ThreadTestHelper> helper(
@@ skipping 18 matching lines @@
 TEST_F(SQLiteOriginBoundCertStoreTest, TestFlush) {
   // File timestamps don't work well on all platforms, so we'll determine
   // whether the DB file has been modified by checking its size.
   FilePath path = temp_dir_.path().Append(chrome::kOBCertFilename);
   base::PlatformFileInfo info;
   ASSERT_TRUE(file_util::GetFileInfo(path, &info));
   int64 base_size = info.size;
 
   // Write some certs, so the DB will have to expand by several KB.
   for (char c = 'a'; c < 'z'; ++c) {
-    std::string origin(1, c);
+    std::string domain(1, c);
     std::string private_key(1000, c);
     std::string cert(1000, c);
     store_->AddOriginBoundCert(
         net::DefaultOriginBoundCertStore::OriginBoundCert(
-            origin,
+            domain,
             net::CLIENT_CERT_RSA_SIGN,
             base::Time(),
             base::Time(),
             private_key,
             cert));
   }
 
   // Call Flush() and wait until the DB thread is idle.
   store_->Flush(base::Closure());
   scoped_refptr<base::ThreadTestHelper> helper(
@@ skipping 33 matching lines @@
 
   store_->Flush(base::Bind(&CallbackCounter::Callback, counter.get()));
 
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
   ASSERT_TRUE(helper->Run());
 
   ASSERT_EQ(1, counter->callback_count());
 }