Stop using CertStore which is not compatible with PlzNavigate.

content/browser/site_per_process_browsertest.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 "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 21 matching lines @@
 #include "content/browser/renderer_host/input/synthetic_tap_gesture.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input/synthetic_tap_gesture_params.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
-#include "content/public/browser/cert_store.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
@@ skipping 467 matching lines @@
   bool expected_visibility_state_;
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
   NotificationRegistrar registrar_;
   bool was_observed_;
   bool did_fail_;
   Source<RenderWidgetHost> source_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostVisibilityObserver);
 };
 
-// A mock CertStore that always assigns the render process host id as
-// the certificate id. Certificates are never removed.
-class MockCertStore : public CertStore {
- public:
-  MockCertStore() {}
-  ~MockCertStore() override {}
-
-  int StoreCert(net::X509Certificate* cert,
-                int render_process_host_id) override {
-    certs_[render_process_host_id] = cert;
-    return render_process_host_id;
-  }
-
-  bool RetrieveCert(int cert_id,
-                    scoped_refptr<net::X509Certificate>* cert) override {
-    if (certs_.find(cert_id) == certs_.end())
-      return false;
-    *cert = certs_[cert_id];
-    return true;
-  }
-
- private:
-  std::map<int, scoped_refptr<net::X509Certificate>> certs_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockCertStore);
-};
-
 class TestInterstitialDelegate : public InterstitialPageDelegate {
  private:
   // InterstitialPageDelegate:
   std::string GetHTMLContents() override { return "<p>Interstitial</p>"; }
 };
 
 }  // namespace
 
 //
 // SitePerProcessBrowserTest
@@ skipping 6212 matching lines @@
     int child_value = 2;
     EXPECT_TRUE(ExecuteScriptAndExtractInt(root, script.c_str(), &root_value));
 
     EXPECT_TRUE(
         ExecuteScriptAndExtractInt(child, script.c_str(), &child_value));
 
     EXPECT_EQ(root_value, child_value);
   }
 }
 
-// Tests that the certificate store is updated during a cross-site
-// redirect navigation. (See https://crbug.com/561754.) Ignores
-// certificate errors so that it can use the cross-site redirector to
-// redirect from HTTPS to HTTPS.
-IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest,
-                       CrossSiteRedirectCertificateStore) {
-  net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
-  https_server.ServeFilesFromSourceDirectory("content/test/data");
-  ASSERT_TRUE(https_server.Start());
-  SetupCrossSiteRedirector(&https_server);
-
-  ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
-  ASSERT_TRUE(rdh);
-  MockCertStore mock_cert_store;
-  rdh->cert_store_for_testing_ = &mock_cert_store;
-
-  // First, navigate to an |https_server| URL to ensure that the site
-  // instance is assigned a site. This will force a renderer transfer to
-  // happen on the following navigation that redirects to a different
-  // site.
-  GURL url(https_server.GetURL("/title1.html"));
-  EXPECT_TRUE(NavigateToURL(shell(), url));
-  int original_process_id =
-      shell()->web_contents()->GetRenderProcessHost()->GetID();
-
-  url = https_server.GetURL("/cross-site/a.test/title1.html");
-  // NavigateToURL() returns false because the committed URL doesn't
-  // match |url| (because it redirected).
-  EXPECT_FALSE(NavigateToURL(shell(), url));
-  EXPECT_TRUE(IsLastCommittedEntryOfPageType(shell()->web_contents(),
-                                             PAGE_TYPE_NORMAL));
-  int new_process_id = shell()->web_contents()->GetRenderProcessHost()->GetID();
-
-  // Test that the mock certificate store saw the certificate associated with
-  // the new renderer process.
-  EXPECT_NE(original_process_id, new_process_id);
-  scoped_refptr<net::X509Certificate> original_cert;
-  scoped_refptr<net::X509Certificate> transfer_cert;
-  ASSERT_TRUE(
-      mock_cert_store.RetrieveCert(original_process_id, &original_cert));
-  ASSERT_TRUE(mock_cert_store.RetrieveCert(new_process_id, &transfer_cert));
-  EXPECT_TRUE(https_server.GetCertificate()->Equals(original_cert.get()));
-  EXPECT_TRUE(https_server.GetCertificate()->Equals(transfer_cert.get()));
-  // Test that the final cert id stored in the navigation entry is the
-  // cert id corresponding to the second renderer process.
-  EXPECT_EQ(new_process_id, shell()
-                                ->web_contents()
-                                ->GetController()
-                                .GetVisibleEntry()
-                                ->GetSSL()
-                                .cert_id);
-}
-
 // Tests that the swapped out state on RenderViewHost is properly reset when
 // the main frame is navigated to the same SiteInstance as one of its child
 // frames.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                        NavigateMainFrameToChildSite) {
   GURL main_url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b)"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
 
   WebContentsImpl* contents = web_contents();
@@ skipping 1143 matching lines @@
   child_rfh->OnDispatchLoad();
 
   // In the bug, OnDispatchLoad killed the b.com renderer.  Ensure that this is
   // not the case. Note that the process kill doesn't happen immediately, so
   // IsRenderFrameLive() can't be checked here (yet).  Instead, check that
   // JavaScript can still execute in b.com using the popup.
   EXPECT_TRUE(ExecuteScript(popup_shell->web_contents(), "true"));
 }
 
 }  // namespace content