| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef NET_HTTP_HTTP_AUTH_PREFERENCES_H_ | 5 #ifndef NET_HTTP_HTTP_AUTH_PREFERENCES_H_ |
| 6 #define NET_HTTP_HTTP_AUTH_PREFERENCES_H_ | 6 #define NET_HTTP_HTTP_AUTH_PREFERENCES_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <set> | 9 #include <set> |
| 9 #include <string> | 10 #include <string> |
| 10 #include <vector> | 11 #include <vector> |
| 11 | 12 |
| 12 #include "base/macros.h" | 13 #include "base/macros.h" |
| 13 #include "net/base/net_export.h" | 14 #include "net/base/net_export.h" |
| 14 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 15 | 16 |
| 16 namespace net { | 17 namespace net { |
| 17 | 18 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 70 |
| 70 #if defined(OS_ANDROID) | 71 #if defined(OS_ANDROID) |
| 71 std::string auth_android_negotiate_account_type_; | 72 std::string auth_android_negotiate_account_type_; |
| 72 #endif | 73 #endif |
| 73 #if defined(OS_POSIX) && !defined(OS_ANDROID) | 74 #if defined(OS_POSIX) && !defined(OS_ANDROID) |
| 74 // GSSAPI library name cannot change after startup, since changing it | 75 // GSSAPI library name cannot change after startup, since changing it |
| 75 // requires unloading the existing GSSAPI library, which could cause all | 76 // requires unloading the existing GSSAPI library, which could cause all |
| 76 // sorts of problems for, for example, active Negotiate transactions. | 77 // sorts of problems for, for example, active Negotiate transactions. |
| 77 const std::string gssapi_library_name_; | 78 const std::string gssapi_library_name_; |
| 78 #endif | 79 #endif |
| 79 scoped_ptr<URLSecurityManager> security_manager_; | 80 std::unique_ptr<URLSecurityManager> security_manager_; |
| 80 DISALLOW_COPY_AND_ASSIGN(HttpAuthPreferences); | 81 DISALLOW_COPY_AND_ASSIGN(HttpAuthPreferences); |
| 81 }; | 82 }; |
| 82 | 83 |
| 83 } // namespace net | 84 } // namespace net |
| 84 #endif // NET_HTTP_HTTP_AUTH_PREFERENCES_H_ | 85 #endif // NET_HTTP_HTTP_AUTH_PREFERENCES_H_ |
| OLD | NEW |