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 "chrome/browser/profiles/profile.h" | 5 #include "chrome/browser/profiles/profile.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 EXPECT_NE(extension_context->cookie_store(), main_context->cookie_store()); | 559 EXPECT_NE(extension_context->cookie_store(), main_context->cookie_store()); |
560 if (extension_context->reporting_service()) { | 560 if (extension_context->reporting_service()) { |
561 EXPECT_NE(extension_context->reporting_service(), | 561 EXPECT_NE(extension_context->reporting_service(), |
562 main_context->reporting_service()); | 562 main_context->reporting_service()); |
563 } | 563 } |
564 | 564 |
565 // Check that the ChannelIDService in the HttpNetworkSession is the same as | 565 // Check that the ChannelIDService in the HttpNetworkSession is the same as |
566 // the one directly on the URLRequestContext. | 566 // the one directly on the URLRequestContext. |
567 EXPECT_EQ(extension_context->http_transaction_factory() | 567 EXPECT_EQ(extension_context->http_transaction_factory() |
568 ->GetSession() | 568 ->GetSession() |
569 ->params() | 569 ->context() |
570 .channel_id_service, | 570 .channel_id_service, |
571 extension_context->channel_id_service()); | 571 extension_context->channel_id_service()); |
572 EXPECT_EQ(main_context->http_transaction_factory() | 572 EXPECT_EQ(main_context->http_transaction_factory() |
573 ->GetSession() | 573 ->GetSession() |
574 ->params() | 574 ->context() |
575 .channel_id_service, | 575 .channel_id_service, |
576 main_context->channel_id_service()); | 576 main_context->channel_id_service()); |
577 } | 577 } |
578 | 578 |
579 } // namespace | 579 } // namespace |
580 | 580 |
581 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, URLRequestContextIsolation) { | 581 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, URLRequestContextIsolation) { |
582 base::ThreadRestrictions::ScopedAllowIO allow_io; | 582 base::ThreadRestrictions::ScopedAllowIO allow_io; |
583 base::ScopedTempDir temp_dir; | 583 base::ScopedTempDir temp_dir; |
584 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); | 584 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 base::Bind(&SendReportHttpResponse, embedded_test_server()->base_url())); | 873 base::Bind(&SendReportHttpResponse, embedded_test_server()->base_url())); |
874 ASSERT_TRUE(hpkp_test_server.Start()); | 874 ASSERT_TRUE(hpkp_test_server.Start()); |
875 | 875 |
876 // To send a report, must use a non-numeric host name for the original | 876 // To send a report, must use a non-numeric host name for the original |
877 // request. This must not match the host name of the server that reports are | 877 // request. This must not match the host name of the server that reports are |
878 // sent to. | 878 // sent to. |
879 ui_test_utils::NavigateToURL(browser(), | 879 ui_test_utils::NavigateToURL(browser(), |
880 hpkp_test_server.GetURL("localhost", "/")); | 880 hpkp_test_server.GetURL("localhost", "/")); |
881 wait_for_report_loop.Run(); | 881 wait_for_report_loop.Run(); |
882 } | 882 } |
OLD | NEW |