← Back to branch summary

~abreu-alexandre/oxide/add-ua-to-downloadrequested

« back to all changes in this revision

Viewing changes to shared/browser/oxide_browser_context.cc

  • Committer: Chris Coulson
  • Date: 2014-07-30 10:35:42 UTC
  • mfrom: (640.1.29 canary)
  • Revision ID: chris.coulson@canonical.com-20140730103542-lzdy0xv7iekidxr3
Bump Chromium rev to 38.0.2107.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_browser_context.cc
40
40
#include "net/http/http_server_properties_impl.h"
41
41
#include "net/http/transport_security_persister.h"
42
42
#include "net/http/transport_security_state.h"
43
 
#include "net/ssl/default_server_bound_cert_store.h"
44
 
#include "net/ssl/server_bound_cert_service.h"
45
 
#include "net/ssl/server_bound_cert_store.h"
 
43
#include "net/ssl/channel_id_service.h"
 
44
#include "net/ssl/channel_id_store.h"
 
45
#include "net/ssl/default_channel_id_store.h"
46
46
#include "net/url_request/data_protocol_handler.h"
47
47
#include "net/url_request/file_protocol_handler.h"
48
48
#include "net/url_request/ftp_protocol_handler.h"
235
235
  context->set_http_user_agent_settings(http_user_agent_settings_.get());
236
236
 
237
237
  // TODO: We want persistent storage here (for non-incognito), but 
238
 
  //       SQLiteServerBoundCertStore is part of chrome
239
 
  storage->set_server_bound_cert_service(
240
 
      new net::ServerBoundCertService(
241
 
          new net::DefaultServerBoundCertStore(NULL),
 
238
  //       SQLiteChannelIDStore is part of chrome
 
239
  storage->set_channel_id_service(
 
240
      new net::ChannelIDService(
 
241
          new net::DefaultChannelIDStore(NULL),
242
242
          base::WorkerPool::GetTaskRunner(true)));
243
243
 
244
244
  context->set_http_server_properties(http_server_properties_->GetWeakPtr());
270
270
  net::HttpNetworkSession::Params session_params;
271
271
  session_params.host_resolver = context->host_resolver();
272
272
  session_params.cert_verifier = context->cert_verifier();
273
 
  session_params.server_bound_cert_service =
274
 
      context->server_bound_cert_service();
 
273
  session_params.channel_id_service = context->channel_id_service();
275
274
  session_params.transport_security_state =
276
275
      context->transport_security_state();
277
276
  session_params.proxy_service = context->proxy_service();