Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Unified Diff: components/cronet/android/cronet_url_request_context_adapter.cc

Issue 996163005: [Cronet] Delay StartNetLog and StopNetLog until native request context is initialized (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added DCHECKs Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/cronet_url_request_context_adapter.cc
diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc
index 1a633587b2597fc5603e738c4a95520496c68d10..1168f68ce6066953923d420a57b6574d7529d1d3 100644
--- a/components/cronet/android/cronet_url_request_context_adapter.cc
+++ b/components/cronet/android/cronet_url_request_context_adapter.cc
@@ -265,7 +265,7 @@ CronetURLRequestContextAdapter::GetNetworkTaskRunner() const {
void CronetURLRequestContextAdapter::StartNetLogToFile(JNIEnv* env,
jobject jcaller,
jstring jfile_name) {
- GetNetworkTaskRunner()->PostTask(
+ PostTaskToNetworkThread(
FROM_HERE,
base::Bind(
&CronetURLRequestContextAdapter::StartNetLogToFileOnNetworkThread,
@@ -274,7 +274,7 @@ void CronetURLRequestContextAdapter::StartNetLogToFile(JNIEnv* env,
}
void CronetURLRequestContextAdapter::StopNetLog(JNIEnv* env, jobject jcaller) {
- GetNetworkTaskRunner()->PostTask(
+ PostTaskToNetworkThread(
FROM_HERE,
base::Bind(&CronetURLRequestContextAdapter::StopNetLogOnNetworkThread,
base::Unretained(this)));
@@ -283,6 +283,8 @@ void CronetURLRequestContextAdapter::StopNetLog(JNIEnv* env, jobject jcaller) {
void CronetURLRequestContextAdapter::StartNetLogToFileOnNetworkThread(
const std::string& file_name) {
DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
+ DCHECK(is_context_initialized_);
+ DCHECK(context_);
// Do nothing if already logging to a file.
if (net_log_logger_)
return;
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698