Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(479)

Side by Side Diff: chrome/browser/devtools/devtools_network_transaction_factory.cc

Issue 666973003: [ServiceWorker] Don't send the UMA related headers to the ServiceWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use set Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/devtools/devtools_network_transaction_factory.h" 5 #include "chrome/browser/devtools/devtools_network_transaction_factory.h"
6 6
7 #include <set>
8 #include <string>
9
7 #include "chrome/browser/devtools/devtools_network_controller.h" 10 #include "chrome/browser/devtools/devtools_network_controller.h"
8 #include "chrome/browser/devtools/devtools_network_transaction.h" 11 #include "chrome/browser/devtools/devtools_network_transaction.h"
12 #include "content/public/browser/service_worker_context.h"
9 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
10 #include "net/http/http_network_layer.h" 14 #include "net/http/http_network_layer.h"
11 #include "net/http/http_network_transaction.h" 15 #include "net/http/http_network_transaction.h"
12 16
13 DevToolsNetworkTransactionFactory::DevToolsNetworkTransactionFactory( 17 DevToolsNetworkTransactionFactory::DevToolsNetworkTransactionFactory(
14 DevToolsNetworkController* controller, 18 DevToolsNetworkController* controller,
15 net::HttpNetworkSession* session) 19 net::HttpNetworkSession* session)
16 : controller_(controller), 20 : controller_(controller),
17 network_layer_(new net::HttpNetworkLayer(session)) { 21 network_layer_(new net::HttpNetworkLayer(session)) {
22 std::set<std::string> headers;
23 headers.insert(DevToolsNetworkTransaction::kDevToolsRequestInitiator);
24 headers.insert(
25 DevToolsNetworkTransaction::kDevToolsEmulateNetworkConditionsClientId);
26 content::ServiceWorkerContext::AddExcludedHeadersForFetchEvent(headers);
18 } 27 }
19 28
20 DevToolsNetworkTransactionFactory::~DevToolsNetworkTransactionFactory() { 29 DevToolsNetworkTransactionFactory::~DevToolsNetworkTransactionFactory() {
21 } 30 }
22 31
23 int DevToolsNetworkTransactionFactory::CreateTransaction( 32 int DevToolsNetworkTransactionFactory::CreateTransaction(
24 net::RequestPriority priority, 33 net::RequestPriority priority,
25 scoped_ptr<net::HttpTransaction>* trans) { 34 scoped_ptr<net::HttpTransaction>* trans) {
26 scoped_ptr<net::HttpTransaction> network_transaction; 35 scoped_ptr<net::HttpTransaction> network_transaction;
27 int rv = network_layer_->CreateTransaction(priority, &network_transaction); 36 int rv = network_layer_->CreateTransaction(priority, &network_transaction);
28 if (rv != net::OK) { 37 if (rv != net::OK) {
29 return rv; 38 return rv;
30 } 39 }
31 trans->reset( 40 trans->reset(
32 new DevToolsNetworkTransaction(controller_, network_transaction.Pass())); 41 new DevToolsNetworkTransaction(controller_, network_transaction.Pass()));
33 return net::OK; 42 return net::OK;
34 } 43 }
35 44
36 net::HttpCache* DevToolsNetworkTransactionFactory::GetCache() { 45 net::HttpCache* DevToolsNetworkTransactionFactory::GetCache() {
37 return network_layer_->GetCache(); 46 return network_layer_->GetCache();
38 } 47 }
39 48
40 net::HttpNetworkSession* DevToolsNetworkTransactionFactory::GetSession() { 49 net::HttpNetworkSession* DevToolsNetworkTransactionFactory::GetSession() {
41 return network_layer_->GetSession(); 50 return network_layer_->GetSession();
42 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698