Update from https://crrev.com/307330
Includes several sky updates for skia API changes and the gn format
presubmit check from https://codereview.chromium.org/779193003/
Review URL: https://codereview.chromium.org/786123002
diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc
index 422ddd7..557051c 100644
--- a/net/http/http_auth_handler_negotiate.cc
+++ b/net/http/http_auth_handler_negotiate.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
+#include "base/profiler/scoped_tracker.h"
#include "base/strings/stringprintf.h"
#include "net/base/address_family.h"
#include "net/base/net_errors.h"
@@ -232,6 +233,11 @@
}
void HttpAuthHandlerNegotiate::OnIOComplete(int result) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "436634 HttpAuthHandlerNegotiate::OnIOComplete"));
+
int rv = DoLoop(result);
if (rv != ERR_IO_PENDING)
DoCallback(rv);