Merge branch '5074-did-get-response-details-resource-type' of https://github.com...

diff --cc atom/browser/net/atom_network_delegate.cc
index dd3e83f07322ad355a23036a781228abd3670dbf,1a83174abfd179ccb49d9452973f35a0e2069954..86bfe12079ad35e029757fbe2ef6e1b1025c5e0c
--- 1/atom/browser/net/atom_network_delegate.cc
--- 2/atom/browser/net/atom_network_delegate.cc
+++ b/atom/browser/net/atom_network_delegate.cc
@@@ -44,6 -37,8 +38,11 @@@ const char* ResourceTypeToString(conten
    }
  }
  
+ namespace {
+ 
++using ResponseHeadersContainer =
++    std::pair<scoped_refptr<net::HttpResponseHeaders>*, const std::string&>;
++
  void RunSimpleListener(const AtomNetworkDelegate::SimpleListener& listener,
                         scoped_ptr<base::DictionaryValue> details) {
    return listener.Run(*(details.get()));