Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / net / cert_verify_proc_chromeos_unittest.cc

diff --git a/src/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc b/src/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc
index f3483b4..0080355 100644 (file)
--- a/src/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc
+++ b/src/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
 
-#include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
+#include "crypto/scoped_test_nss_chromeos_user.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_verify_proc.h"
@@ -286,7 +286,8 @@ class CertVerifyProcChromeOSOrderingTest
 // Test a variety of different combinations of (maybe) verifying / (maybe)
 // importing / verifying again, to try to find any cases where caching might
 // affect the results.
-TEST_P(CertVerifyProcChromeOSOrderingTest, TrustThenVerify) {
+// http://crbug.com/396501
+TEST_P(CertVerifyProcChromeOSOrderingTest, DISABLED_TrustThenVerify) {
   const ParamType& param = GetParam();
   const bool verify_first = std::tr1::get<0>(param);
   const int trust_bitmask = std::tr1::get<1>(param);