Remove certificates from Channel ID

chrome/browser/browsing_data/browsing_data_channel_id_helper_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 "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 
 #include "base/bind.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "crypto/ec_private_key.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 class BrowsingDataChannelIDHelperTest
     : public testing::Test,
       public net::SSLConfigService::Observer {
  public:
   BrowsingDataChannelIDHelperTest() : ssl_config_changed_count_(0) {
   }
 
   void SetUp() override {
     testing_profile_.reset(new TestingProfile());
 
     testing_profile_->GetSSLConfigService()->AddObserver(this);
   }
 
   void TearDown() override {
     testing_profile_->GetSSLConfigService()->RemoveObserver(this);
   }
 
   void CreateChannelIDsForTest() {
     net::URLRequestContext* context =
         testing_profile_->GetRequestContext()->GetURLRequestContext();
     net::ChannelIDStore* channel_id_store =
         context->channel_id_service()->GetChannelIDStore();
-    channel_id_store->SetChannelID("https://www.google.com:443",
-                                   base::Time(), base::Time(),
-                                   "key", "cert");
-    channel_id_store->SetChannelID("https://www.youtube.com:443",
-                                   base::Time(), base::Time(),
-                                   "key", "cert");
+    channel_id_store->SetChannelID(
+        make_scoped_ptr(new net::ChannelIDStore::ChannelID(
+            "https://www.google.com:443", base::Time(),
+            make_scoped_ptr(crypto::ECPrivateKey::Create()))));
+    channel_id_store->SetChannelID(
+        make_scoped_ptr(new net::ChannelIDStore::ChannelID(
+            "https://www.youtube.com:443", base::Time(),
+            make_scoped_ptr(crypto::ECPrivateKey::Create()))));
   }
 
   void FetchCallback(
       const net::ChannelIDStore::ChannelIDList& channel_ids) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     channel_id_list_ = channel_ids;
   }
 
   // net::SSLConfigService::Observer implementation:
   void OnSSLConfigChanged() override { ssl_config_changed_count_++; }
@@ skipping 73 matching lines @@
 }
 
 TEST_F(BrowsingDataChannelIDHelperTest, CannedEmpty) {
   std::string origin = "https://www.google.com";
 
   scoped_refptr<CannedBrowsingDataChannelIDHelper> helper(
       new CannedBrowsingDataChannelIDHelper());
 
   ASSERT_TRUE(helper->empty());
   helper->AddChannelID(net::ChannelIDStore::ChannelID(
-      origin, base::Time(), base::Time(), "key", "cert"));
+      origin, base::Time(), make_scoped_ptr(crypto::ECPrivateKey::Create())));
   ASSERT_FALSE(helper->empty());
   helper->Reset();
   ASSERT_TRUE(helper->empty());
 }