Reland: Fix imported server certs being distrusted in NSS 3.13.

chrome/browser/chromeos/cros/onc_network_parser_unittest.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 "chrome/browser/chromeos/cros/onc_network_parser.h"
 
 #include <cert.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
@@ skipping 15 matching lines @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/test/test_browser_thread.h"
 #include "crypto/nss_util.h"
 #include "net/base/cert_database.h"
 #include "net/base/cert_type.h"
 #include "net/base/crypto_module.h"
 #include "net/base/x509_certificate.h"
 #include "net/proxy/proxy_config.h"
-#include "net/third_party/mozilla_security_manager/nsNSSCertTrust.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using ::testing::AnyNumber;
 using ::testing::Return;
 
-namespace msm = mozilla_security_manager;
 namespace chromeos {
 
 namespace {
 
 const char g_token_name[] = "OncNetworkParserTest token";
 
 net::CertType GetCertType(const net::X509Certificate* cert) {
   DCHECK(cert);
   return x509_certificate_model::GetType(cert->os_cert_handle());
 }
@@ skipping 882 matching lines @@
 
   EXPECT_EQ("a onc b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_id_pattern, source));
   EXPECT_EQ("a onc@example.com b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_email_pattern, source));
 }
 
 }  // namespace chromeos