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

Side by Side Diff: net/http/http_auth_handler_negotiate.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_auth_handler_negotiate.h" 5 #include "net/http/http_auth_handler_negotiate.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 resolver_ = resolver; 56 resolver_ = resolver;
57 } 57 }
58 58
59 int HttpAuthHandlerNegotiate::Factory::CreateAuthHandler( 59 int HttpAuthHandlerNegotiate::Factory::CreateAuthHandler(
60 HttpAuthChallengeTokenizer* challenge, 60 HttpAuthChallengeTokenizer* challenge,
61 HttpAuth::Target target, 61 HttpAuth::Target target,
62 const SSLInfo& ssl_info, 62 const SSLInfo& ssl_info,
63 const GURL& origin, 63 const GURL& origin,
64 CreateReason reason, 64 CreateReason reason,
65 int digest_nonce_count, 65 int digest_nonce_count,
66 const BoundNetLog& net_log, 66 const NetLogWithSource& net_log,
67 std::unique_ptr<HttpAuthHandler>* handler) { 67 std::unique_ptr<HttpAuthHandler>* handler) {
68 #if defined(OS_WIN) 68 #if defined(OS_WIN)
69 if (is_unsupported_ || reason == CREATE_PREEMPTIVE) 69 if (is_unsupported_ || reason == CREATE_PREEMPTIVE)
70 return ERR_UNSUPPORTED_AUTH_SCHEME; 70 return ERR_UNSUPPORTED_AUTH_SCHEME;
71 if (max_token_length_ == 0) { 71 if (max_token_length_ == 0) {
72 int rv = DetermineMaxTokenLength(auth_library_.get(), NEGOSSP_NAME, 72 int rv = DetermineMaxTokenLength(auth_library_.get(), NEGOSSP_NAME,
73 &max_token_length_); 73 &max_token_length_);
74 if (rv == ERR_UNSUPPORTED_AUTH_SCHEME) 74 if (rv == ERR_UNSUPPORTED_AUTH_SCHEME)
75 is_unsupported_ = true; 75 is_unsupported_ = true;
76 if (rv != OK) 76 if (rv != OK)
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 bool HttpAuthHandlerNegotiate::CanDelegate() const { 366 bool HttpAuthHandlerNegotiate::CanDelegate() const {
367 // TODO(cbentzel): Should delegation be allowed on proxies? 367 // TODO(cbentzel): Should delegation be allowed on proxies?
368 if (target_ == HttpAuth::AUTH_PROXY) 368 if (target_ == HttpAuth::AUTH_PROXY)
369 return false; 369 return false;
370 if (!http_auth_preferences_) 370 if (!http_auth_preferences_)
371 return false; 371 return false;
372 return http_auth_preferences_->CanDelegate(origin_); 372 return http_auth_preferences_->CanDelegate(origin_);
373 } 373 }
374 374
375 } // namespace net 375 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698