OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/android/offline_pages/offline_page_request_job.h" | 5 #include "chrome/browser/android/offline_pages/offline_page_request_job.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/feature_list.h" | 8 #include "base/feature_list.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 12 matching lines...) Expand all Loading... | |
23 #include "chrome/test/base/testing_browser_process.h" | 23 #include "chrome/test/base/testing_browser_process.h" |
24 #include "chrome/test/base/testing_profile.h" | 24 #include "chrome/test/base/testing_profile.h" |
25 #include "chrome/test/base/testing_profile_manager.h" | 25 #include "chrome/test/base/testing_profile_manager.h" |
26 #include "components/offline_pages/core/client_namespace_constants.h" | 26 #include "components/offline_pages/core/client_namespace_constants.h" |
27 #include "components/offline_pages/core/offline_page_model_impl.h" | 27 #include "components/offline_pages/core/offline_page_model_impl.h" |
28 #include "components/previews/core/previews_decider.h" | 28 #include "components/previews/core/previews_decider.h" |
29 #include "components/previews/core/previews_experiments.h" | 29 #include "components/previews/core/previews_experiments.h" |
30 #include "content/public/browser/browser_thread.h" | 30 #include "content/public/browser/browser_thread.h" |
31 #include "content/public/browser/resource_request_info.h" | 31 #include "content/public/browser/resource_request_info.h" |
32 #include "content/public/browser/web_contents.h" | 32 #include "content/public/browser/web_contents.h" |
33 #include "content/public/common/previews_state.h" | |
33 #include "content/public/common/resource_type.h" | 34 #include "content/public/common/resource_type.h" |
34 #include "content/public/test/test_browser_thread_bundle.h" | 35 #include "content/public/test/test_browser_thread_bundle.h" |
35 #include "net/url_request/url_request.h" | 36 #include "net/url_request/url_request.h" |
36 #include "net/url_request/url_request_context.h" | 37 #include "net/url_request/url_request_context.h" |
37 #include "net/url_request/url_request_intercepting_job_factory.h" | 38 #include "net/url_request/url_request_intercepting_job_factory.h" |
38 #include "net/url_request/url_request_job_factory_impl.h" | 39 #include "net/url_request/url_request_job_factory_impl.h" |
39 #include "net/url_request/url_request_test_util.h" | 40 #include "net/url_request/url_request_test_util.h" |
40 #include "testing/gtest/include/gtest/gtest.h" | 41 #include "testing/gtest/include/gtest/gtest.h" |
41 | 42 |
42 namespace offline_pages { | 43 namespace offline_pages { |
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
433 url_request_delegate_ = base::MakeUnique<TestURLRequestDelegate>( | 434 url_request_delegate_ = base::MakeUnique<TestURLRequestDelegate>( |
434 base::Bind(&OfflinePageRequestJobTest::ReadCompletedOnIO, | 435 base::Bind(&OfflinePageRequestJobTest::ReadCompletedOnIO, |
435 base::Unretained(this))); | 436 base::Unretained(this))); |
436 | 437 |
437 std::unique_ptr<net::URLRequest> request = | 438 std::unique_ptr<net::URLRequest> request = |
438 url_request_context()->CreateRequest( | 439 url_request_context()->CreateRequest( |
439 url, net::DEFAULT_PRIORITY, url_request_delegate_.get()); | 440 url, net::DEFAULT_PRIORITY, url_request_delegate_.get()); |
440 request->set_method(method); | 441 request->set_method(method); |
441 | 442 |
442 content::ResourceRequestInfo::AllocateForTesting( | 443 content::ResourceRequestInfo::AllocateForTesting( |
443 request.get(), | 444 request.get(), resource_type, nullptr, 1, /* render_process_id */ |
Nico
2017/01/09 22:35:03
nit: if, instead of putting the comment at the end
megjablon
2017/01/10 22:30:01
Done.
| |
444 resource_type, | 445 -1, /* render_view_id */ |
445 nullptr, | 446 1, /* render_frame_id */ |
446 1, /* render_process_id */ | 447 true, /* is_main_frame */ |
447 -1, /* render_view_id */ | 448 false, /* parent_is_main_frame */ |
448 1, /* render_frame_id */ | 449 true, /* allow_download */ |
449 true, /* is_main_frame */ | 450 true, /* is_async */ |
450 false, /* parent_is_main_frame */ | 451 content::PREVIEWS_OFF /* previews_state */); |
451 true, /* allow_download */ | |
452 true, /* is_async */ | |
453 false /* is_using_lofi */); | |
454 | 452 |
455 return request; | 453 return request; |
456 } | 454 } |
457 | 455 |
458 void | 456 void |
459 OfflinePageRequestJobTest::ExpectOneUniqueSampleForAggregatedRequestResult( | 457 OfflinePageRequestJobTest::ExpectOneUniqueSampleForAggregatedRequestResult( |
460 OfflinePageRequestJob::AggregatedRequestResult result) { | 458 OfflinePageRequestJob::AggregatedRequestResult result) { |
461 histogram_tester_.ExpectUniqueSample( | 459 histogram_tester_.ExpectUniqueSample( |
462 kAggregatedRequestResultHistogram, static_cast<int>(result), 1); | 460 kAggregatedRequestResultHistogram, static_cast<int>(result), 1); |
463 } | 461 } |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
859 offline_page_tab_helper()->GetOfflinePageForTest()->offline_id); | 857 offline_page_tab_helper()->GetOfflinePageForTest()->offline_id); |
860 ExpectOneNonuniqueSampleForAggregatedRequestResult( | 858 ExpectOneNonuniqueSampleForAggregatedRequestResult( |
861 OfflinePageRequestJob::AggregatedRequestResult:: | 859 OfflinePageRequestJob::AggregatedRequestResult:: |
862 REDIRECTED_ON_DISCONNECTED_NETWORK); | 860 REDIRECTED_ON_DISCONNECTED_NETWORK); |
863 ExpectOneNonuniqueSampleForAggregatedRequestResult( | 861 ExpectOneNonuniqueSampleForAggregatedRequestResult( |
864 OfflinePageRequestJob::AggregatedRequestResult:: | 862 OfflinePageRequestJob::AggregatedRequestResult:: |
865 SHOW_OFFLINE_ON_DISCONNECTED_NETWORK); | 863 SHOW_OFFLINE_ON_DISCONNECTED_NETWORK); |
866 } | 864 } |
867 | 865 |
868 } // namespace offline_pages | 866 } // namespace offline_pages |
OLD | NEW |