projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 11.39.250.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
profiles
/
profile_impl_io_data.cc
diff --git
a/src/chrome/browser/profiles/profile_impl_io_data.cc
b/src/chrome/browser/profiles/profile_impl_io_data.cc
index
dd61413
..
e121662
100644
(file)
--- a/
src/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/
src/chrome/browser/profiles/profile_impl_io_data.cc
@@
-114,9
+114,6
@@
ProfileImplIOData::Handle::~Handle() {
if (io_data_->http_server_properties_manager_)
io_data_->http_server_properties_manager_->ShutdownOnPrefThread();
if (io_data_->http_server_properties_manager_)
io_data_->http_server_properties_manager_->ShutdownOnPrefThread();
- if (io_data_->domain_reliability_monitor_)
- io_data_->domain_reliability_monitor_->DestroyReportingPref();
-
io_data_->ShutdownOnUIThread(GetAllContextGetters().Pass());
}
io_data_->ShutdownOnUIThread(GetAllContextGetters().Pass());
}
@@
-596,6
+593,7
@@
void ProfileImplIOData::InitializeInternal(
domain_reliability_monitor_.get();
monitor->InitURLRequestContext(main_context);
monitor->AddBakedInConfigs();
domain_reliability_monitor_.get();
monitor->InitURLRequestContext(main_context);
monitor->AddBakedInConfigs();
+ monitor->SetDiscardUploads(!GetMetricsEnabledStateOnIOThread());
network_delegate()->set_domain_reliability_monitor(monitor);
}
network_delegate()->set_domain_reliability_monitor(monitor);
}