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

Side by Side Diff: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove openssl stubs, replace TrustBits::TRUST_TERMINAL_RECORD with EXPLICIT_DISTRUST Created 8 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/cros/onc_network_parser.h" 5 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <keyhi.h> 8 #include <keyhi.h>
9 #include <pk11pub.h> 9 #include <pk11pub.h>
10 10
(...skipping 15 matching lines...) Expand all
26 #include "chrome/test/base/testing_browser_process.h" 26 #include "chrome/test/base/testing_browser_process.h"
27 #include "chrome/test/base/testing_pref_service.h" 27 #include "chrome/test/base/testing_pref_service.h"
28 #include "chromeos/dbus/dbus_thread_manager.h" 28 #include "chromeos/dbus/dbus_thread_manager.h"
29 #include "content/test/test_browser_thread.h" 29 #include "content/test/test_browser_thread.h"
30 #include "crypto/nss_util.h" 30 #include "crypto/nss_util.h"
31 #include "net/base/cert_database.h" 31 #include "net/base/cert_database.h"
32 #include "net/base/cert_type.h" 32 #include "net/base/cert_type.h"
33 #include "net/base/crypto_module.h" 33 #include "net/base/crypto_module.h"
34 #include "net/base/x509_certificate.h" 34 #include "net/base/x509_certificate.h"
35 #include "net/proxy/proxy_config.h" 35 #include "net/proxy/proxy_config.h"
36 #include "net/third_party/mozilla_security_manager/nsNSSCertTrust.h"
37 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
38 #include "third_party/cros_system_api/dbus/service_constants.h" 37 #include "third_party/cros_system_api/dbus/service_constants.h"
39 38
40 using ::testing::AnyNumber; 39 using ::testing::AnyNumber;
41 using ::testing::Return; 40 using ::testing::Return;
42 41
43 namespace msm = mozilla_security_manager; 42 namespace msm = mozilla_security_manager;
44 namespace chromeos { 43 namespace chromeos {
45 44
46 namespace { 45 namespace {
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 935
937 EXPECT_EQ("a onc b", 936 EXPECT_EQ("a onc b",
938 chromeos::OncNetworkParser::GetUserExpandedValue( 937 chromeos::OncNetworkParser::GetUserExpandedValue(
939 login_id_pattern, source)); 938 login_id_pattern, source));
940 EXPECT_EQ("a onc@example.com b", 939 EXPECT_EQ("a onc@example.com b",
941 chromeos::OncNetworkParser::GetUserExpandedValue( 940 chromeos::OncNetworkParser::GetUserExpandedValue(
942 login_email_pattern, source)); 941 login_email_pattern, source));
943 } 942 }
944 943
945 } // namespace chromeos 944 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698