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

Unified Diff: chrome/browser/chromeos/cros/network_library_unittest.cc

Issue 20041002: Make CertificateHandler a proper interface of CertificateImporter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/network_configuration_updater_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/network_library_unittest.cc
diff --git a/chrome/browser/chromeos/cros/network_library_unittest.cc b/chrome/browser/chromeos/cros/network_library_unittest.cc
index 6f3731a46a43f1067922d002beea7c5acfe0340a..06223fcbc94b26176442cd17b3f30aeabe3324ee 100644
--- a/chrome/browser/chromeos/cros/network_library_unittest.cc
+++ b/chrome/browser/chromeos/cros/network_library_unittest.cc
@@ -20,7 +20,7 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/google_apis/test_util.h"
#include "chrome/common/chrome_paths.h"
-#include "chromeos/network/onc/onc_certificate_importer.h"
+#include "chromeos/network/onc/onc_certificate_importer_impl.h"
#include "chromeos/network/onc/onc_constants.h"
#include "chromeos/network/onc/onc_test_utils.h"
#include "chromeos/network/onc/onc_utils.h"
@@ -294,9 +294,9 @@ TEST_F(NetworkLibraryStubTest, NetworkConnectWifiWithCertPattern) {
onc_root->GetListWithoutPathExpansion(onc::toplevel_config::kCertificates,
&certificates);
- onc::CertificateImporter importer(true /* allow trust imports */);
- ASSERT_EQ(onc::CertificateImporter::IMPORT_OK,
- importer.ParseAndStoreCertificates(*certificates, NULL, NULL));
+ onc::CertificateImporterImpl importer;
+ ASSERT_TRUE(importer.ImportCertificates(
+ *certificates, onc::ONC_SOURCE_USER_IMPORT, NULL));
WifiNetwork* wifi = cros_->FindWifiNetworkByPath("wifi_cert_pattern");
@@ -323,9 +323,9 @@ TEST_F(NetworkLibraryStubTest, NetworkConnectVPNWithCertPattern) {
onc_root->GetListWithoutPathExpansion(onc::toplevel_config::kCertificates,
&certificates);
- onc::CertificateImporter importer(true /* allow trust imports */);
- ASSERT_EQ(onc::CertificateImporter::IMPORT_OK,
- importer.ParseAndStoreCertificates(*certificates, NULL, NULL));
+ onc::CertificateImporterImpl importer;
+ ASSERT_TRUE(importer.ImportCertificates(
+ *certificates, onc::ONC_SOURCE_USER_IMPORT, NULL));
VirtualNetwork* vpn = cros_->FindVirtualNetworkByPath("vpn_cert_pattern");
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/network_configuration_updater_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698