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

Side by Side Diff: chromeos/network/network_cert_migrator_unittest.cc

Issue 401623006: Extract ScopedTestNSSDB from nss_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chromeos/network/network_cert_migrator.h" 5 #include "chromeos/network/network_cert_migrator.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "chromeos/cert_loader.h" 12 #include "chromeos/cert_loader.h"
13 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "chromeos/dbus/shill_service_client.h" 14 #include "chromeos/dbus/shill_service_client.h"
15 #include "chromeos/network/network_state_handler.h" 15 #include "chromeos/network/network_state_handler.h"
16 #include "chromeos/tpm_token_loader.h" 16 #include "chromeos/tpm_token_loader.h"
17 #include "crypto/nss_util.h"
18 #include "crypto/nss_util_internal.h" 17 #include "crypto/nss_util_internal.h"
18 #include "crypto/scoped_test_nss_chromeos_user.h"
19 #include "net/base/crypto_module.h" 19 #include "net/base/crypto_module.h"
20 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
21 #include "net/base/test_data_directory.h" 21 #include "net/base/test_data_directory.h"
22 #include "net/cert/nss_cert_database_chromeos.h" 22 #include "net/cert/nss_cert_database_chromeos.h"
23 #include "net/cert/x509_certificate.h" 23 #include "net/cert/x509_certificate.h"
24 #include "net/test/cert_test_util.h" 24 #include "net/test/cert_test_util.h"
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
26 #include "third_party/cros_system_api/dbus/service_constants.h" 26 #include "third_party/cros_system_api/dbus/service_constants.h"
27 27
28 namespace chromeos { 28 namespace chromeos {
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 SetupNetworkHandlers(); 255 SetupNetworkHandlers();
256 256
257 base::RunLoop().RunUntilIdle(); 257 base::RunLoop().RunUntilIdle();
258 std::string nss_nickname, ca_pem; 258 std::string nss_nickname, ca_pem;
259 GetVpnCACertProperties(false /* not OpenVPN */, &nss_nickname, &ca_pem); 259 GetVpnCACertProperties(false /* not OpenVPN */, &nss_nickname, &ca_pem);
260 EXPECT_TRUE(nss_nickname.empty()); 260 EXPECT_TRUE(nss_nickname.empty());
261 EXPECT_EQ(test_ca_cert_pem_, ca_pem); 261 EXPECT_EQ(test_ca_cert_pem_, ca_pem);
262 } 262 }
263 263
264 } // namespace chromeos 264 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698