port nw.App proxy API implementation to NS

rogerwang · rogerwang · commit 4d7e328c604b · 2019-09-11T20:51:52.000-06:00
diff --git a/src/api/nw_app_api.cc b/src/api/nw_app_api.cc
@@ -13,6 +13,8 @@
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/devtools_util.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/net/profile_network_context_service.h"
+#include "chrome/browser/net/profile_network_context_service_factory.h"
 #include "content/nw/src/api/nw_app.h"
 #include "content/nw/src/nw_base.h"
 #include "content/public/browser/render_frame_host.h"
@@ -34,18 +36,6 @@
 
 using namespace extensions::nwapi::nw__app;
 
-namespace {
-void SetProxyConfigCallback(
-    base::WaitableEvent* done,
-    const scoped_refptr<net::URLRequestContextGetter>& url_request_context_getter,
-    const net::ProxyConfigWithAnnotation& proxy_config) {
-  net::ProxyResolutionService* proxy_service =
-      url_request_context_getter->GetURLRequestContext()->proxy_resolution_service();
-  proxy_service->ResetConfigService(base::WrapUnique(new net::ProxyConfigServiceFixed(proxy_config)));
-  done->Signal();
-}
-} // namespace
-
 namespace extensions {
 NwAppQuitFunction::NwAppQuitFunction() {
 
@@ -204,19 +194,10 @@ bool NwAppSetProxyConfigFunction::RunNWSync(base::ListValue* response, std::stri
     config = net::ProxyConfigWithAnnotation(pc, TRAFFIC_ANNOTATION_FOR_TESTS);
   }
 
-  base::ScopedAllowBaseSyncPrimitivesOutsideBlockingScope allow_wait;
-
-  content::RenderProcessHost* render_process_host = GetSenderWebContents()->GetMainFrame()->GetProcess();
-  net::URLRequestContextGetter* context_getter =
-    render_process_host->GetStoragePartition()->GetURLRequestContext();
-
-  base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
-                           base::WaitableEvent::InitialState::NOT_SIGNALED);
-  base::PostTaskWithTraits(
-      FROM_HERE, {content::BrowserThread::IO},
-      base::BindOnce(&SetProxyConfigCallback, &done,
-                 base::WrapRefCounted(context_getter), config));
-  done.Wait();
+  Profile* profile = Profile::FromBrowserContext(context_);
+  auto* profile_network_context =
+    ProfileNetworkContextServiceFactory::GetForContext(profile);
+  profile_network_context->UpdateProxyConfig(config);
   return true;
 }
 
