[ServiceWorker] Don't send the UMA related headers to the ServiceWorker.

content/browser/service_worker/service_worker_url_request_job.cc

 // Copyright 2014 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 "content/browser/service_worker/service_worker_url_request_job.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
 
 namespace {
 
 // Keep in sync with kDevToolsRequestInitiator and
 // kDevToolsEmulateNetworkConditionsClientId defined in
 // devtools_network_transaction.cc and InspectorResourceAgent.cpp.
 const char kDevToolsRequestInitiator[] = "X-DevTools-Request-Initiator";
 const char kDevToolsEmulateNetworkConditionsClientId[] =
     "X-DevTools-Emulate-Network-Conditions-Client-Id";
 
+// Keep in sync with variations_http_header_provider.cc.

[michaeln, 2014/10/22 22:19:40]

Having to manually keep these files in sysnc is probably not a good idea.

[Alexei Svitkine (slow), 2014/10/24 15:35:48]

Agreed.

I think we probably want to have a IsVariationsHeader(name) method or similar on
VariationsHttpHeaderProvider and call this from here (probably through an
interface, since this code is content likely shouldn't depend on the variations
component).

[michaeln, 2014/10/24 19:49:50]

The content lib cannot depend on variations component, but i believe there's no
issue with variations_http_header_provider component depending on the content
lib. This is why i was suggesting an content/public interface for the
variations_http_header_provider to invoke that would inform the sw system about
which to exclude. I had in mind a one-time call that would add values to a
global map.

[horo, 2014/10/27 14:15:40]

Ah. I didn't notice that there is 'variations_http_provider' target in
variations.gypi.

I uploaded Patch Set 2.
Please review this.

+const char kChromeUMAEnabled[] = "X-Chrome-UMA-Enabled";
+const char kClientData[] = "X-Client-Data";
+
 }  // namespace
 
 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
     FetchRequestMode request_mode,
     FetchCredentialsMode credentials_mode,
     RequestContextType request_context_type,
@@ skipping 241 matching lines @@
   scoped_ptr<ServiceWorkerFetchRequest> request(
       new ServiceWorkerFetchRequest());
   request->mode = request_mode_;
   request->request_context_type = request_context_type_;
   request->frame_type = frame_type_;
   request->url = request_->url();
   request->method = request_->method();
   const net::HttpRequestHeaders& headers = request_->extra_request_headers();
   for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext();) {
     if (it.name() == kDevToolsRequestInitiator ||
-        it.name() == kDevToolsEmulateNetworkConditionsClientId) {
+        it.name() == kDevToolsEmulateNetworkConditionsClientId ||
+        it.name() == kChromeUMAEnabled ||
+        it.name() == kClientData) {
       continue;
     }
     request->headers[it.name()] = it.value();
   }
   request->blob_uuid = blob_uuid;
   request->blob_size = blob_size;
   request->referrer = GURL(request_->referrer());
   request->credentials_mode = credentials_mode_;
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   if (info) {
@@ skipping 178 matching lines @@
 
 void ServiceWorkerURLRequestJob::DeliverErrorResponse() {
   // TODO(falken): Print an error to the console of the ServiceWorker and of
   // the requesting page.
   CreateResponseHeader(
       500, "Service Worker Response Error", ServiceWorkerHeaderMap());
   CommitResponseHeader();
 }
 
 }  // namespace content