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

Unified Diff: ios/crnet/crnet_environment.h

Issue 1158033010: [CrNet] Properly setup net log. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded get() Created 5 years, 6 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 | « ios/crnet/crnet.gyp ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/crnet/crnet_environment.h
diff --git a/ios/crnet/crnet_environment.h b/ios/crnet/crnet_environment.h
index e3a71c3ca07f716cb2b482349d6e30c4b0714039..30678fa5d1ceb58622c51e0fcc3a2d29ab9d07c6 100644
--- a/ios/crnet/crnet_environment.h
+++ b/ios/crnet/crnet_environment.h
@@ -10,16 +10,17 @@
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#import "ios/crnet/CrNet.h"
-#include "ios/crnet/crnet_net_log.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
namespace net {
class HttpCache;
class NetworkChangeNotifier;
+class NetLog;
class ProxyConfigService;
class SdchManager;
class URLRequestContextGetter;
+class WriteToFileNetLogObserver;
}
class CrNetHttpProtocolHandlerDelegate;
@@ -143,9 +144,8 @@ class CrNetEnvironment {
scoped_ptr<net::URLRequestContext> main_context_;
scoped_ptr<CrNetHttpProtocolHandlerDelegate> http_protocol_handler_delegate_;
std::string user_agent_product_name_;
- base::Lock net_log_lock_;
- bool net_log_started_;
- scoped_ptr<CrNetNetLog> net_log_;
+ scoped_ptr<net::NetLog> net_log_;
+ scoped_ptr<net::WriteToFileNetLogObserver> net_log_observer_;
DISALLOW_COPY_AND_ASSIGN(CrNetEnvironment);
};
« no previous file with comments | « ios/crnet/crnet.gyp ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698