[Android WebView] Use NetLog for providing full request headers to DevTools

android_webview/browser/aw_browser_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_browser_context.h"
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/browser/aw_quota_manager_bridge.h"
 #include "android_webview/browser/aw_resource_context.h"
@@ skipping 33 matching lines @@
 
 AwBrowserContext* g_browser_context = NULL;
 
 }  // namespace
 
 // Data reduction proxy is disabled by default.
 bool AwBrowserContext::data_reduction_proxy_enabled_ = false;
 
 AwBrowserContext::AwBrowserContext(
     const FilePath path,
-    JniDependencyFactory* native_factory)
+    JniDependencyFactory* native_factory,
+    net::NetLog* net_log)
     : context_storage_path_(path),
-      native_factory_(native_factory) {
+      native_factory_(native_factory),
+      net_log_(net_log) {
   DCHECK(!g_browser_context);
   g_browser_context = this;
 
   // This constructor is entered during the creation of ContentBrowserClient,
   // before browser threads are created. Therefore any checks to enforce
   // threading (such as BrowserThread::CurrentlyOn()) will fail here.
 }
 
 AwBrowserContext::~AwBrowserContext() {
   DCHECK_EQ(this, g_browser_context);
@@ skipping 53 matching lines @@
                          base::Unretained(
                              data_reduction_proxy_config_service.get())),
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
     data_reduction_proxy_settings_->SetProxyConfigurator(
         data_reduction_proxy_configurator_.get());
   }
 
   url_request_context_getter_ =
       new AwURLRequestContextGetter(GetPath(),
                                     cookie_store_.get(),
-                                    data_reduction_proxy_config_service.Pass());
+                                    data_reduction_proxy_config_service.Pass(),
+                                    net_log_);
 
   visitedlink_master_.reset(
       new visitedlink::VisitedLinkMaster(this, this, false));
   visitedlink_master_->Init();
 
   form_database_service_.reset(
       new AwFormDatabaseService(context_storage_path_));
 }
 
 void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
@@ skipping 79 matching lines @@
 base::FilePath AwBrowserContext::GetPath() const {
   return context_storage_path_;
 }
 
 bool AwBrowserContext::IsOffTheRecord() const {
   // Android WebView does not support off the record profile yet.
   return false;
 }
 
 net::URLRequestContextGetter* AwBrowserContext::GetRequestContext() {
   return GetDefaultStoragePartition(this)->GetURLRequestContext();

[benm (inactive), 2014/09/09 11:11:27]

I was looking to see if we could have the BrowserContext (or even the
URLRequestContextGetter) own the NetLog instead of passing the pointer through
constructors and noticed this ... I wonder if this should this be a return
url_request_context_getter_? If so, then I think we would be able to have the
URLRequestContextGetter own the netlog, and have the content client fish it out
from there via browsercontext.

WDYT?

[mnaganov (inactive), 2014/09/09 13:02:28]

This seems to be a pattern in Chrome of creating an instance of
URLRequestContextGetter via BrowserContext::CreateRequestContext, then sharing
it with StoragePartitionImpl, and then always retrieving via
StoragePartition::GetURLRequestContext. I guess, this is made for supporting
several StoragePartitions inside the browser (for incognito, etc), but as
WebView only has single profile, this doesn't seem to be relevant for us.

Thus, the URLRequestContextGetter instance returned from
AwBrowserContext::GetRequestContext is indeed always the same one stored in
url_request_context_getter_. But just for the sake of uniformity, we should
leave this code as is.

Anyway, because net::URLRequestContextGetter interface doesn't provide access to
a NetLog instance, we can't use AwBrowserContext::GetRequestContex in
AwContentBrowserClient, and instead I have added a specific getter for obtaining
AwURLRequestContextGetter.

 }
 
 net::URLRequestContextGetter*
 AwBrowserContext::GetRequestContextForRenderProcess(
     int renderer_child_id) {
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter* AwBrowserContext::GetMediaRequestContext() {
   return GetRequestContext();
@@ skipping 46 matching lines @@
 
 void AwBrowserContext::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
   // can change in the lifetime of this WebView and may not yet be set here.
   // Therefore this initialization path is not used.
   enumerator->OnComplete(true);
 }
 
 }  // namespace android_webview