OLD | NEW |
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 "base/base64.h" | 5 #include "base/base64.h" |
6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
770 base::JSONWriter::Write(&jwk_value, &tls_channel_id_value); | 770 base::JSONWriter::Write(&jwk_value, &tls_channel_id_value); |
771 return tls_channel_id_value; | 771 return tls_channel_id_value; |
772 } | 772 } |
773 | 773 |
774 private: | 774 private: |
775 void CreateDomainBoundCertOnIOThread( | 775 void CreateDomainBoundCertOnIOThread( |
776 std::string* domain_bound_private_key, | 776 std::string* domain_bound_private_key, |
777 std::string* domain_bound_cert, | 777 std::string* domain_bound_cert, |
778 net::ServerBoundCertService::RequestHandle* request_handle, | 778 net::ServerBoundCertService::RequestHandle* request_handle, |
779 scoped_refptr<net::URLRequestContextGetter> request_context_getter) { | 779 scoped_refptr<net::URLRequestContextGetter> request_context_getter) { |
780 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 780 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
781 net::ServerBoundCertService* server_bound_cert_service = | 781 net::ServerBoundCertService* server_bound_cert_service = |
782 request_context_getter->GetURLRequestContext()-> | 782 request_context_getter->GetURLRequestContext()-> |
783 server_bound_cert_service(); | 783 server_bound_cert_service(); |
784 int status = server_bound_cert_service->GetOrCreateDomainBoundCert( | 784 int status = server_bound_cert_service->GetOrCreateDomainBoundCert( |
785 chromium_org_url().host(), | 785 chromium_org_url().host(), |
786 domain_bound_private_key, | 786 domain_bound_private_key, |
787 domain_bound_cert, | 787 domain_bound_cert, |
788 base::Bind(&ExternallyConnectableMessagingWithTlsChannelIdTest:: | 788 base::Bind(&ExternallyConnectableMessagingWithTlsChannelIdTest:: |
789 GotDomainBoundCert, | 789 GotDomainBoundCert, |
790 base::Unretained(this)), | 790 base::Unretained(this)), |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); | 965 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); |
966 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR , | 966 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR , |
967 CanConnectAndSendMessagesToMainFrame("invalid")); | 967 CanConnectAndSendMessagesToMainFrame("invalid")); |
968 } | 968 } |
969 | 969 |
970 #endif // !defined(OS_WIN) - http://crbug.com/350517. | 970 #endif // !defined(OS_WIN) - http://crbug.com/350517. |
971 | 971 |
972 } // namespace | 972 } // namespace |
973 | 973 |
974 }; // namespace extensions | 974 }; // namespace extensions |
OLD | NEW |