Index: android_webview/browser/aw_content_browser_client.cc |
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc |
index fcff39774970a01abceeef09df7ad7acd058a5bf..21943ed8802afe81f1d2c3d1751cea7b5242397a 100644 |
--- a/android_webview/browser/aw_content_browser_client.cc |
+++ b/android_webview/browser/aw_content_browser_client.cc |
@@ -30,6 +30,7 @@ |
#include "content/public/common/url_constants.h" |
#include "content/public/common/web_preferences.h" |
#include "net/android/network_library.h" |
+#include "net/base/net_log.h" |
#include "net/ssl/ssl_cert_request_info.h" |
#include "net/ssl/ssl_info.h" |
#include "ui/base/l10n/l10n_util_android.h" |
@@ -185,8 +186,9 @@ AwContentBrowserClient::AwContentBrowserClient( |
if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) { |
NOTREACHED() << "Failed to get app data directory for Android WebView"; |
} |
+ net_log_.reset(new net::NetLog()); |
browser_context_.reset( |
- new AwBrowserContext(user_data_dir, native_factory_)); |
+ new AwBrowserContext(user_data_dir, native_factory_, net_log_.get())); |
} |
AwContentBrowserClient::~AwContentBrowserClient() { |
@@ -508,8 +510,7 @@ void AwContentBrowserClient::ResourceDispatcherHostCreated() { |
} |
net::NetLog* AwContentBrowserClient::GetNetLog() { |
- // TODO(boliu): Implement AwNetLog. |
- return NULL; |
+ return net_log_.get(); |
} |
content::AccessTokenStore* AwContentBrowserClient::CreateAccessTokenStore() { |