| Index: net/http/mock_sspi_library_win.cc
|
| diff --git a/net/http/mock_sspi_library_win.cc b/net/http/mock_sspi_library_win.cc
|
| index c3d875c01706eb7ce7e77746da3a7fd7e1f720b0..1b145d22fcca2e39daaca184dd73820d16c9e053 100644
|
| --- a/net/http/mock_sspi_library_win.cc
|
| +++ b/net/http/mock_sspi_library_win.cc
|
| @@ -27,7 +27,7 @@ SECURITY_STATUS MockSSPILibrary::AcquireCredentialsHandle(
|
| PCredHandle phCredential,
|
| PTimeStamp ptsExpiry) {
|
| // Fill in phCredential with arbitrary value.
|
| - phCredential->dwLower = phCredential->dwUpper = ((ULONG_PTR) ((INT_PTR)0));
|
| + phCredential->dwLower = phCredential->dwUpper = ((ULONG_PTR)((INT_PTR)0));
|
| return SEC_E_OK;
|
| }
|
|
|
| @@ -47,18 +47,19 @@ SECURITY_STATUS MockSSPILibrary::InitializeSecurityContext(
|
| // Fill in the outbound buffer with garbage data.
|
| PSecBuffer out_buffer = pOutput->pBuffers;
|
| out_buffer->cbBuffer = 2;
|
| - uint8* buf = reinterpret_cast<uint8 *>(out_buffer->pvBuffer);
|
| + uint8* buf = reinterpret_cast<uint8*>(out_buffer->pvBuffer);
|
| buf[0] = 0xAB;
|
| buf[1] = 0xBA;
|
|
|
| // Fill in phNewContext with arbitrary value if it's invalid.
|
| if (phNewContext != phContext)
|
| - phNewContext->dwLower = phNewContext->dwUpper = ((ULONG_PTR) ((INT_PTR)0));
|
| + phNewContext->dwLower = phNewContext->dwUpper = ((ULONG_PTR)((INT_PTR)0));
|
| return SEC_E_OK;
|
| }
|
|
|
| SECURITY_STATUS MockSSPILibrary::QuerySecurityPackageInfo(
|
| - LPWSTR pszPackageName, PSecPkgInfoW *pkgInfo) {
|
| + LPWSTR pszPackageName,
|
| + PSecPkgInfoW* pkgInfo) {
|
| EXPECT_TRUE(!expected_package_queries_.empty());
|
| PackageQuery package_query = expected_package_queries_.front();
|
| expected_package_queries_.pop_front();
|
| @@ -72,23 +73,23 @@ SECURITY_STATUS MockSSPILibrary::QuerySecurityPackageInfo(
|
|
|
| SECURITY_STATUS MockSSPILibrary::FreeCredentialsHandle(
|
| PCredHandle phCredential) {
|
| - EXPECT_TRUE(phCredential->dwLower == ((ULONG_PTR) ((INT_PTR) 0)));
|
| - EXPECT_TRUE(phCredential->dwLower == ((ULONG_PTR) ((INT_PTR) 0)));
|
| + EXPECT_TRUE(phCredential->dwLower == ((ULONG_PTR)((INT_PTR)0)));
|
| + EXPECT_TRUE(phCredential->dwLower == ((ULONG_PTR)((INT_PTR)0)));
|
| SecInvalidateHandle(phCredential);
|
| return SEC_E_OK;
|
| }
|
|
|
| SECURITY_STATUS MockSSPILibrary::DeleteSecurityContext(PCtxtHandle phContext) {
|
| - EXPECT_TRUE(phContext->dwLower == ((ULONG_PTR) ((INT_PTR) 0)));
|
| - EXPECT_TRUE(phContext->dwLower == ((ULONG_PTR) ((INT_PTR) 0)));
|
| + EXPECT_TRUE(phContext->dwLower == ((ULONG_PTR)((INT_PTR)0)));
|
| + EXPECT_TRUE(phContext->dwLower == ((ULONG_PTR)((INT_PTR)0)));
|
| SecInvalidateHandle(phContext);
|
| return SEC_E_OK;
|
| }
|
|
|
| SECURITY_STATUS MockSSPILibrary::FreeContextBuffer(PVOID pvContextBuffer) {
|
| PSecPkgInfoW package_info = static_cast<PSecPkgInfoW>(pvContextBuffer);
|
| - std::set<PSecPkgInfoW>::iterator it = expected_freed_packages_.find(
|
| - package_info);
|
| + std::set<PSecPkgInfoW>::iterator it =
|
| + expected_freed_packages_.find(package_info);
|
| EXPECT_TRUE(it != expected_freed_packages_.end());
|
| expected_freed_packages_.erase(it);
|
| return SEC_E_OK;
|
| @@ -98,8 +99,7 @@ void MockSSPILibrary::ExpectQuerySecurityPackageInfo(
|
| const std::wstring& expected_package,
|
| SECURITY_STATUS response_code,
|
| PSecPkgInfoW package_info) {
|
| - PackageQuery package_query = {expected_package, response_code,
|
| - package_info};
|
| + PackageQuery package_query = {expected_package, response_code, package_info};
|
| expected_package_queries_.push_back(package_query);
|
| }
|
|
|
|
|