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

android_webview/browser/aw_resource_context.cc

Index: android_webview/browser/aw_resource_context.cc
diff --git a/android_webview/browser/aw_resource_context.cc b/android_webview/browser/aw_resource_context.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0def1362fd9f13282966e05ce9cd021420524bf7
--- /dev/null
+++ b/android_webview/browser/aw_resource_context.cc
@@ -0,0 +1,58 @@
+// Copyright (c) 2013 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_resource_context.h"
+
+#include "content/public/browser/browser_thread.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
+
+namespace android_webview {
+
+AwResourceContext::AwResourceContext(net::URLRequestContextGetter* getter)
+    : getter_(getter) {
+  DCHECK(getter_);
+}
+
+AwResourceContext::~AwResourceContext() {
+}
+
+net::HostResolver* AwResourceContext::GetHostResolver() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  return getter_->GetURLRequestContext()->host_resolver();
+}
+
+net::URLRequestContext* AwResourceContext::GetRequestContext() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  return getter_->GetURLRequestContext();
+}
+
+bool AwResourceContext::AllowMicAccess(const GURL& origin) {
+  return false;
+}
+
+bool AwResourceContext::AllowCameraAccess(const GURL& origin) {
+  return false;
+}
+
+void AwResourceContext::SetExtraHeaders(const GURL& url, std::string& headers) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  if (!url.is_valid()) return;
+  base::AutoLock scoped_lock(lock_);
+  if (!headers.empty())
+    extra_headers_[url.spec()] = headers;
+  else
+    extra_headers_.erase(url.spec());

[sgurun-gerrit only, 2013/12/06 20:08:55]

probably I missed it. Once extra headers are added for a URL, where do we get
rid of them later? do we always keep them?

[mnaganov (inactive), 2013/12/07 16:10:26]

We get rid of them, if there will be another loadUrl call for the same URL but
no extra headers. We must keep the headers, because we need to inject them again
on reloads and back / forward navs. As we check the transition type, we will not
be injecting headers if the same page is loaded as a result of user-initiated
navigation (clicking a link) or as a child resource (e.g. as an iframe).

+}
+
+std::string AwResourceContext::GetExtraHeaders(const GURL& url) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  if (!url.is_valid()) return std::string();
+  base::AutoLock scoped_lock(lock_);
+  std::map<std::string, std::string>::iterator iter =
+      extra_headers_.find(url.spec());
+  return iter != extra_headers_.end() ? iter->second : std::string();
+}
+
+}  // namespace android_webview