[Android WebView] Only send extra headers for the main page

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

Index: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index c88722bc9950603db4545b66a6a51e6ff8ba0518..11c85d0b6e1b266884fd085f0a61506c99217ec9 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -8,6 +8,7 @@
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_login_delegate.h"
+#include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/common/url_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ -225,6 +226,8 @@ void AwResourceDispatcherHostDelegate::RequestBeginning(
   if (!io_client)
     return;
 
+  AddExtraHeadersIfNeeded(request, resource_context);
+
   throttles->push_back(new IoThreadClientThrottle(
       child_id, route_id, request));
 
@@ -247,6 +250,15 @@ void AwResourceDispatcherHostDelegate::RequestBeginning(
   }
 }
 
+void AwResourceDispatcherHostDelegate::OnRequestRedirected(
+    const GURL& redirect_url,
+    net::URLRequest* request,
+    content::ResourceContext* resource_context,
+    content::ResourceResponse* response) {
+  AddExtraHeadersIfNeeded(request, resource_context);
+}
+
+
 void AwResourceDispatcherHostDelegate::DownloadStarting(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
@@ -412,4 +424,31 @@ void AwResourceDispatcherHostDelegate::OnIoThreadClientReadyInternal(
   }
 }
 
+void AwResourceDispatcherHostDelegate::AddExtraHeadersIfNeeded(
+    net::URLRequest* request,
+    content::ResourceContext* resource_context) {
+  const content::ResourceRequestInfo* request_info =
+      content::ResourceRequestInfo::ForRequest(request);
+  if (!request_info) return;
+  if (request_info->GetResourceType() != ResourceType::MAIN_FRAME) return;
+
+  const bool is_load_url = request_info->GetPageTransition() &
+      content::PAGE_TRANSITION_FROM_API;
+  const bool is_go_back_forward = request_info->GetPageTransition() &
+      content::PAGE_TRANSITION_FORWARD_BACK;
+  const bool is_reload = content::PageTransitionCoreTypeIs(
+      request_info->GetPageTransition(), content::PAGE_TRANSITION_RELOAD);
+  if (is_load_url || is_go_back_forward || is_reload) {
+    AwResourceContext* awrc = static_cast<AwResourceContext*>(resource_context);
+    std::string extra_headers = awrc->GetExtraHeaders(request->url());
+    if (!extra_headers.empty()) {
+      net::HttpRequestHeaders headers;
+      headers.AddHeadersFromString(extra_headers);
+      for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
+        request->SetExtraRequestHeaderByName(it.name(), it.value(), true);

[benm (inactive), 2013/12/09 17:49:11]

What's the behaviour in Classic vs. Chromium WebView if we try to overwrite a
header that's already set, and is it consistent? IIRC Classic would overwrite
with the headers provided by loadUrl.

[mnaganov (inactive), 2013/12/10 11:03:31]

That's a good catch! In fact, the old WebView seems to never override existing
headers, so using 'true' here is incorrect. Changed to 'false'.

+      }
+    }
+  }
+}
+
 }  // namespace android_webview