summaryrefslogtreecommitdiffstats
path: root/chromium/net/base/net_errors.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/base/net_errors.h')
-rw-r--r--chromium/net/base/net_errors.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/net/base/net_errors.h b/chromium/net/base/net_errors.h
index 34e355e1104..2c513612209 100644
--- a/chromium/net/base/net_errors.h
+++ b/chromium/net/base/net_errors.h
@@ -8,7 +8,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/platform_file.h"
+#include "base/files/file.h"
#include "net/base/net_export.h"
namespace net {
@@ -36,8 +36,9 @@ NET_EXPORT const char* ErrorToString(int error);
inline bool IsCertificateError(int error) {
// Certificate errors are negative integers from net::ERR_CERT_BEGIN
// (inclusive) to net::ERR_CERT_END (exclusive) in *decreasing* order.
+ // ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN is currently an exception to this
+ // rule.
return (error <= ERR_CERT_BEGIN && error > ERR_CERT_END) ||
- (error == ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY) ||
(error == ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN);
}
@@ -53,9 +54,8 @@ NET_EXPORT Error MapSystemError(int os_error);
// error code that is not followed immediately by a valid error code.
NET_EXPORT std::vector<int> GetAllErrorCodesForUma();
-// A convenient function to translate platform file error to net error code.
-NET_EXPORT Error PlatformFileErrorToNetError(
- base::PlatformFileError file_error);
+// A convenient function to translate file error to net error code.
+NET_EXPORT Error FileErrorToNetError(base::File::Error file_error);
} // namespace net