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

Side by Side Diff: components/cronet/android/cronet_url_request_context_adapter.cc

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename NetLogLogger and CapturingNetLog(removed compiler error for chromeOS) Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/cronet/android/cronet_url_request_context_adapter.h" 5 #include "components/cronet/android/cronet_url_request_context_adapter.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/files/scoped_file.h" 11 #include "base/files/scoped_file.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "components/cronet/url_request_context_config.h" 15 #include "components/cronet/url_request_context_config.h"
16 #include "jni/CronetUrlRequestContext_jni.h" 16 #include "jni/CronetUrlRequestContext_jni.h"
17 #include "net/base/load_flags.h" 17 #include "net/base/load_flags.h"
18 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/base/network_delegate_impl.h" 19 #include "net/base/network_delegate_impl.h"
20 #include "net/http/http_auth_handler_factory.h" 20 #include "net/http/http_auth_handler_factory.h"
21 #include "net/log/net_log_logger.h" 21 #include "net/log/write_to_file_net_log_observer.h"
22 #include "net/proxy/proxy_service.h" 22 #include "net/proxy/proxy_service.h"
23 #include "net/url_request/url_request_context.h" 23 #include "net/url_request/url_request_context.h"
24 #include "net/url_request/url_request_context_builder.h" 24 #include "net/url_request/url_request_context_builder.h"
25 25
26 namespace { 26 namespace {
27 27
28 class BasicNetworkDelegate : public net::NetworkDelegateImpl { 28 class BasicNetworkDelegate : public net::NetworkDelegateImpl {
29 public: 29 public:
30 BasicNetworkDelegate() {} 30 BasicNetworkDelegate() {}
31 ~BasicNetworkDelegate() override {} 31 ~BasicNetworkDelegate() override {}
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 DCHECK(is_context_initialized_); 286 DCHECK(is_context_initialized_);
287 DCHECK(context_); 287 DCHECK(context_);
288 // Do nothing if already logging to a file. 288 // Do nothing if already logging to a file.
289 if (net_log_logger_) 289 if (net_log_logger_)
290 return; 290 return;
291 base::FilePath file_path(file_name); 291 base::FilePath file_path(file_name);
292 base::ScopedFILE file(base::OpenFile(file_path, "w")); 292 base::ScopedFILE file(base::OpenFile(file_path, "w"));
293 if (!file) 293 if (!file)
294 return; 294 return;
295 295
296 net_log_logger_.reset(new net::NetLogLogger()); 296 net_log_logger_.reset(new net::WriteToFileNetLogObserver());
297 net_log_logger_->StartObserving(context_->net_log(), file.Pass(), nullptr, 297 net_log_logger_->StartObserving(context_->net_log(), file.Pass(), nullptr,
298 context_.get()); 298 context_.get());
299 } 299 }
300 300
301 void CronetURLRequestContextAdapter::StopNetLogOnNetworkThread() { 301 void CronetURLRequestContextAdapter::StopNetLogOnNetworkThread() {
302 DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread()); 302 DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
303 if (net_log_logger_) { 303 if (net_log_logger_) {
304 net_log_logger_->StopObserving(context_.get()); 304 net_log_logger_->StopObserving(context_.get());
305 net_log_logger_.reset(); 305 net_log_logger_.reset();
306 } 306 }
(...skipping 17 matching lines...) Expand all
324 } 324 }
325 325
326 static jint SetMinLogLevel(JNIEnv* env, jclass jcaller, jint jlog_level) { 326 static jint SetMinLogLevel(JNIEnv* env, jclass jcaller, jint jlog_level) {
327 jint old_log_level = static_cast<jint>(logging::GetMinLogLevel()); 327 jint old_log_level = static_cast<jint>(logging::GetMinLogLevel());
328 // MinLogLevel is global, shared by all URLRequestContexts. 328 // MinLogLevel is global, shared by all URLRequestContexts.
329 logging::SetMinLogLevel(static_cast<int>(jlog_level)); 329 logging::SetMinLogLevel(static_cast<int>(jlog_level));
330 return old_log_level; 330 return old_log_level;
331 } 331 }
332 332
333 } // namespace cronet 333 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698