Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc

Issue 420963002: Reenable PolicyCertVerifierTest.VerifyUsingAdditionalTrustAnchor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" 5 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 ASSERT_EQ(net::ERR_IO_PENDING, error); 169 ASSERT_EQ(net::ERR_IO_PENDING, error);
170 EXPECT_TRUE(request_handle); 170 EXPECT_TRUE(request_handle);
171 error = callback.WaitForResult(); 171 error = callback.WaitForResult();
172 EXPECT_EQ(net::OK, error); 172 EXPECT_EQ(net::OK, error);
173 173
174 // The additional trust anchors were not used, since the certificate is 174 // The additional trust anchors were not used, since the certificate is
175 // trusted from the database. 175 // trusted from the database.
176 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); 176 EXPECT_FALSE(WasTrustAnchorUsedAndReset());
177 } 177 }
178 178
179 // http://crbug.com/396497 179 TEST_F(PolicyCertVerifierTest, VerifyUsingAdditionalTrustAnchor) {
180 TEST_F(PolicyCertVerifierTest, DISABLED_VerifyUsingAdditionalTrustAnchor) {
181 ASSERT_TRUE(SupportsAdditionalTrustAnchors()); 180 ASSERT_TRUE(SupportsAdditionalTrustAnchors());
182 181
183 // |test_server_cert_| is untrusted, so Verify() fails. 182 // |test_server_cert_| is untrusted, so Verify() fails.
184 { 183 {
185 net::CertVerifyResult verify_result; 184 net::CertVerifyResult verify_result;
186 net::TestCompletionCallback callback; 185 net::TestCompletionCallback callback;
187 net::CertVerifier::RequestHandle request_handle = NULL; 186 net::CertVerifier::RequestHandle request_handle = NULL;
188 int error = VerifyTestServerCert(callback, &verify_result, &request_handle); 187 int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
189 ASSERT_EQ(net::ERR_IO_PENDING, error); 188 ASSERT_EQ(net::ERR_IO_PENDING, error);
190 EXPECT_TRUE(request_handle); 189 EXPECT_TRUE(request_handle);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 int error = VerifyTestServerCert(callback, &verify_result, &request_handle); 226 int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
228 // Note: this hits the cached result from the first Verify() in this test. 227 // Note: this hits the cached result from the first Verify() in this test.
229 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); 228 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
230 } 229 }
231 // The additional trust anchors were reset, thus |cert_verifier_| should not 230 // The additional trust anchors were reset, thus |cert_verifier_| should not
232 // signal it's usage anymore. 231 // signal it's usage anymore.
233 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); 232 EXPECT_FALSE(WasTrustAnchorUsedAndReset());
234 } 233 }
235 234
236 } // namespace policy 235 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698