diff --git a/brightray/browser/browser_context.h b/brightray/browser/browser_context.h
index 31db2ce23f47..421ef51f43ce 100644
--- a/brightray/browser/browser_context.h
+++ b/brightray/browser/browser_context.h
@@ -65,7 +65,7 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors) override;
 
-  net::URLRequestContextGetter* url_request_context_getter() const {
+  URLRequestContextGetter* url_request_context_getter() const {
     return url_request_getter_.get();
   }
 
diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc
index e9ba78ff0807..12d13d71c43c 100644
--- a/brightray/browser/url_request_context_getter.cc
+++ b/brightray/browser/url_request_context_getter.cc
@@ -107,13 +107,13 @@ std::string URLRequestContextGetter::Delegate::GetUserAgent() {
 
 std::unique_ptr<net::URLRequestJobFactory>
 URLRequestContextGetter::Delegate::CreateURLRequestJobFactory(
-    content::ProtocolHandlerMap* protocol_handlers,
-    content::URLRequestInterceptorScopedVector* protocol_interceptors) {
+    content::ProtocolHandlerMap* protocol_handlers) {
   std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(new net::URLRequestJobFactoryImpl);
 
-  for (auto it = protocol_handlers->begin(); it != protocol_handlers->end(); ++it)
+  for (auto& it : *protocol_handlers) {
     job_factory->SetProtocolHandler(
-        it->first, base::WrapUnique(it->second.release()));
+        it.first, base::WrapUnique(it.second.release()));
+  }
   protocol_handlers->clear();
 
   job_factory->SetProtocolHandler(
@@ -124,15 +124,7 @@ URLRequestContextGetter::Delegate::CreateURLRequestJobFactory(
           BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
               base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
 
-  // Set up interceptors in the reverse order.
-  std::unique_ptr<net::URLRequestJobFactory> top_job_factory = std::move(job_factory);
-  content::URLRequestInterceptorScopedVector::reverse_iterator i;
-  for (i = protocol_interceptors->rbegin(); i != protocol_interceptors->rend(); ++i)
-    top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
-        std::move(top_job_factory), base::WrapUnique(*i)));
-  protocol_interceptors->weak_clear();
-
-  return top_job_factory;
+  return std::move(job_factory);
 }
 
 net::HttpCache::BackendFactory*
@@ -172,7 +164,8 @@ URLRequestContextGetter::URLRequestContextGetter(
       in_memory_(in_memory),
       io_loop_(io_loop),
       file_loop_(file_loop),
-      protocol_interceptors_(std::move(protocol_interceptors)) {
+      protocol_interceptors_(std::move(protocol_interceptors)),
+      job_factory_(nullptr) {
   // Must first be created on the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -373,8 +366,23 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
                              false)));
     }
 
-    storage_->set_job_factory(delegate_->CreateURLRequestJobFactory(
-        &protocol_handlers_, &protocol_interceptors_));
+    std::unique_ptr<net::URLRequestJobFactory> job_factory =
+        delegate_->CreateURLRequestJobFactory(&protocol_handlers_);
+    job_factory_ = job_factory.get();
+
+    // Set up interceptors in the reverse order.
+    std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
+        std::move(job_factory);
+    content::URLRequestInterceptorScopedVector::reverse_iterator it;
+    for (it = protocol_interceptors_.rbegin();
+         it != protocol_interceptors_.rend();
+         ++it) {
+      top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
+          std::move(top_job_factory), make_scoped_ptr(*it)));
+    }
+    protocol_interceptors_.weak_clear();
+
+    storage_->set_job_factory(std::move(top_job_factory));
   }
 
   return url_request_context_.get();
diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h
index 30ec8a3f3e41..7dc5ccfff8b5 100644
--- a/brightray/browser/url_request_context_getter.h
+++ b/brightray/browser/url_request_context_getter.h
@@ -40,9 +40,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
     virtual net::NetworkDelegate* CreateNetworkDelegate() { return NULL; }
     virtual std::string GetUserAgent();
-    virtual std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
-        content::ProtocolHandlerMap* protocol_handlers,
-        content::URLRequestInterceptorScopedVector* protocol_interceptors);
+    virtual std::unique_ptr<net::URLRequestJobFactory>
+        CreateURLRequestJobFactory(
+            content::ProtocolHandlerMap* protocol_handlers);
     virtual net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
         const base::FilePath& base_path);
     virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier();
@@ -66,6 +66,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const override;
 
   net::HostResolver* host_resolver();
+  net::URLRequestJobFactory* job_factory() const { return job_factory_; }
 
  private:
   Delegate* delegate_;
@@ -87,6 +88,8 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
   content::ProtocolHandlerMap protocol_handlers_;
   content::URLRequestInterceptorScopedVector protocol_interceptors_;
 
+  net::URLRequestJobFactory* job_factory_;  // weak ref
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetter);
 };