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/loader/chrome_resource_dispatcher_host_delegate.h" | 5 #include "chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
344 } | 344 } |
345 } | 345 } |
346 } | 346 } |
347 | 347 |
348 void NotifyUIThreadOfRequestComplete( | 348 void NotifyUIThreadOfRequestComplete( |
349 const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter, | 349 const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter, |
350 const GURL& url, | 350 const GURL& url, |
351 const content::GlobalRequestID& request_id, | 351 const content::GlobalRequestID& request_id, |
352 ResourceType resource_type, | 352 ResourceType resource_type, |
353 bool was_cached, | 353 bool was_cached, |
354 bool used_data_reduction_proxy, | 354 std::unique_ptr<data_reduction_proxy::DataReductionProxyData> |
355 data_reduction_proxy_data, | |
355 int net_error, | 356 int net_error, |
356 int64_t total_received_bytes, | 357 int64_t total_received_bytes, |
357 int64_t raw_body_bytes, | 358 int64_t raw_body_bytes, |
358 int64_t original_content_length, | 359 int64_t original_content_length, |
359 base::TimeTicks request_creation_time, | 360 base::TimeTicks request_creation_time, |
360 base::TimeDelta request_loading_time) { | 361 base::TimeDelta request_loading_time) { |
361 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 362 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
362 content::WebContents* web_contents = web_contents_getter.Run(); | 363 content::WebContents* web_contents = web_contents_getter.Run(); |
363 if (!web_contents) | 364 if (!web_contents) |
364 return; | 365 return; |
365 if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) { | 366 if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) { |
366 LogMainFrameMetricsOnUIThread(url, net_error, request_loading_time, | 367 LogMainFrameMetricsOnUIThread(url, net_error, request_loading_time, |
367 web_contents); | 368 web_contents); |
368 } | 369 } |
369 if (!was_cached) { | 370 if (!was_cached) { |
370 UpdatePrerenderNetworkBytesCallback(web_contents, total_received_bytes); | 371 UpdatePrerenderNetworkBytesCallback(web_contents, total_received_bytes); |
371 #if defined(OS_ANDROID) | 372 #if defined(OS_ANDROID) |
372 offline_pages::BackgroundLoaderOffliner* background_loader = | 373 offline_pages::BackgroundLoaderOffliner* background_loader = |
373 offline_pages::BackgroundLoaderOffliner::FromWebContents(web_contents); | 374 offline_pages::BackgroundLoaderOffliner::FromWebContents(web_contents); |
374 | 375 |
375 if (background_loader) | 376 if (background_loader) |
376 background_loader->OnNetworkBytesChanged(total_received_bytes); | 377 background_loader->OnNetworkBytesChanged(total_received_bytes); |
377 #endif // OS_ANDROID | 378 #endif // OS_ANDROID |
378 } | 379 } |
379 page_load_metrics::MetricsWebContentsObserver* metrics_observer = | 380 page_load_metrics::MetricsWebContentsObserver* metrics_observer = |
380 page_load_metrics::MetricsWebContentsObserver::FromWebContents( | 381 page_load_metrics::MetricsWebContentsObserver::FromWebContents( |
381 web_contents); | 382 web_contents); |
382 if (metrics_observer) { | 383 if (metrics_observer) { |
383 metrics_observer->OnRequestComplete( | 384 metrics_observer->OnRequestComplete(request_id, resource_type, was_cached, |
384 request_id, resource_type, was_cached, used_data_reduction_proxy, | 385 std::move(data_reduction_proxy_data), |
385 raw_body_bytes, original_content_length, request_creation_time); | 386 raw_body_bytes, original_content_length, |
387 request_creation_time); | |
386 } | 388 } |
387 } | 389 } |
388 | 390 |
389 } // namespace | 391 } // namespace |
390 | 392 |
391 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate() | 393 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate() |
392 : download_request_limiter_(g_browser_process->download_request_limiter()), | 394 : download_request_limiter_(g_browser_process->download_request_limiter()), |
393 safe_browsing_(g_browser_process->safe_browsing_service()) | 395 safe_browsing_(g_browser_process->safe_browsing_service()) |
394 #if BUILDFLAG(ENABLE_EXTENSIONS) | 396 #if BUILDFLAG(ENABLE_EXTENSIONS) |
395 , user_script_listener_(new extensions::UserScriptListener()) | 397 , user_script_listener_(new extensions::UserScriptListener()) |
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
836 if (!url_request) | 838 if (!url_request) |
837 return; | 839 return; |
838 // TODO(maksims): remove this and use net_error argument in RequestComplete | 840 // TODO(maksims): remove this and use net_error argument in RequestComplete |
839 // once ResourceDispatcherHostDelegate is modified. | 841 // once ResourceDispatcherHostDelegate is modified. |
840 int net_error = url_request->status().error(); | 842 int net_error = url_request->status().error(); |
841 const ResourceRequestInfo* info = | 843 const ResourceRequestInfo* info = |
842 ResourceRequestInfo::ForRequest(url_request); | 844 ResourceRequestInfo::ForRequest(url_request); |
843 | 845 |
844 data_reduction_proxy::DataReductionProxyData* data = | 846 data_reduction_proxy::DataReductionProxyData* data = |
845 data_reduction_proxy::DataReductionProxyData::GetData(*url_request); | 847 data_reduction_proxy::DataReductionProxyData::GetData(*url_request); |
846 bool used_data_reduction_proxy = data && data->used_data_reduction_proxy(); | 848 std::unique_ptr<data_reduction_proxy::DataReductionProxyData> |
849 data_reduction_proxy_data; | |
850 if (data) | |
Charlie Harrison
2017/04/20 20:52:50
Can you comment when this would be null? If this i
RyanSturm
2017/04/20 21:33:00
I just cut this way down by only adding session ke
Charlie Harrison
2017/04/20 22:00:52
Ok that's fine by me.
| |
851 data_reduction_proxy_data = data->DeepCopy(); | |
847 int64_t original_content_length = | 852 int64_t original_content_length = |
848 used_data_reduction_proxy | 853 data && data->used_data_reduction_proxy() |
849 ? data_reduction_proxy::util::CalculateEffectiveOCL(*url_request) | 854 ? data_reduction_proxy::util::CalculateEffectiveOCL(*url_request) |
850 : url_request->GetRawBodyBytes(); | 855 : url_request->GetRawBodyBytes(); |
851 | 856 |
852 BrowserThread::PostTask( | 857 BrowserThread::PostTask( |
853 BrowserThread::UI, FROM_HERE, | 858 BrowserThread::UI, FROM_HERE, |
854 base::Bind(&NotifyUIThreadOfRequestComplete, | 859 base::Bind(&NotifyUIThreadOfRequestComplete, |
855 info->GetWebContentsGetterForRequest(), url_request->url(), | 860 info->GetWebContentsGetterForRequest(), url_request->url(), |
856 info->GetGlobalRequestID(), info->GetResourceType(), | 861 info->GetGlobalRequestID(), info->GetResourceType(), |
857 url_request->was_cached(), used_data_reduction_proxy, | 862 url_request->was_cached(), |
858 net_error, url_request->GetTotalReceivedBytes(), | 863 base::Passed(&data_reduction_proxy_data), net_error, |
864 url_request->GetTotalReceivedBytes(), | |
859 url_request->GetRawBodyBytes(), original_content_length, | 865 url_request->GetRawBodyBytes(), original_content_length, |
860 url_request->creation_time(), | 866 url_request->creation_time(), |
861 base::TimeTicks::Now() - url_request->creation_time())); | 867 base::TimeTicks::Now() - url_request->creation_time())); |
862 } | 868 } |
863 | 869 |
864 content::PreviewsState ChromeResourceDispatcherHostDelegate::GetPreviewsState( | 870 content::PreviewsState ChromeResourceDispatcherHostDelegate::GetPreviewsState( |
865 const net::URLRequest& url_request, | 871 const net::URLRequest& url_request, |
866 content::ResourceContext* resource_context) { | 872 content::ResourceContext* resource_context) { |
867 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); | 873 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); |
868 data_reduction_proxy::DataReductionProxyIOData* data_reduction_proxy_io_data = | 874 data_reduction_proxy::DataReductionProxyIOData* data_reduction_proxy_io_data = |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
933 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, | 939 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, |
934 base::Unretained(this), url, request_loading_time)); | 940 base::Unretained(this), url, request_loading_time)); |
935 return; | 941 return; |
936 } | 942 } |
937 | 943 |
938 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? | 944 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? |
939 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); | 945 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); |
940 rappor::SampleDomainAndRegistryFromGURL( | 946 rappor::SampleDomainAndRegistryFromGURL( |
941 g_browser_process->rappor_service(), metric_name, url); | 947 g_browser_process->rappor_service(), metric_name, url); |
942 } | 948 } |
OLD | NEW |