Browse Source

Remove the evil URLRequestContextGetter::network_delegate

Cheng Zhao 7 years ago
parent
commit
1918da7c2e

+ 7 - 6
atom/browser/api/atom_api_session.cc

@@ -441,14 +441,15 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
 }
 
 void SetDevToolsNetworkEmulationClientIdInIO(
-    brightray::URLRequestContextGetter* context_getter,
+    brightray::URLRequestContextGetter* url_request_context_getter,
     const std::string& client_id) {
-  if (!context_getter)
+  if (!url_request_context_getter)
     return;
-  auto network_delegate =
-      static_cast<AtomNetworkDelegate*>(context_getter->network_delegate());
-  if (network_delegate)
-    network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
+  net::URLRequestContext* context =
+      url_request_context_getter->GetURLRequestContext();
+  AtomNetworkDelegate* network_delegate =
+      static_cast<AtomNetworkDelegate*>(context->network_delegate());
+  network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
 }
 
 }  // namespace

+ 0 - 5
brightray/browser/url_request_context_getter.h

@@ -80,11 +80,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
   net::HostResolver* host_resolver();
   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-  net::NetworkDelegate* network_delegate() const {
-    if (url_request_context_)
-      return url_request_context_->network_delegate();
-    return nullptr;
-  }
 
  private:
   Delegate* delegate_;