ppapi: PPB_VpnProvider: Bind VpnService to the PPAPI Resource Host

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

Index: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
index fcb13ca62b77bd85ca1aaf22fc4b3fd0d0817608..e57fb53721577f0163cad2cd0a573d723c41607b 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -31,6 +31,10 @@
 #include "content/public/browser/vpn_service_proxy.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#if defined(OS_CHROMEOS)

[sky, 2016/06/21 16:16:39]

conditional includes go after non-conditional includes (see style guide).

[adrian.belgun, 2016/06/21 19:14:16]

Done.

+#include "extensions/browser/api/vpn_provider/vpn_service.h"
+#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
+#endif  // defined(OS_CHROMEOS)
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
 #include "extensions/browser/extension_host.h"
@@ -494,7 +498,15 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
 std::unique_ptr<content::VpnServiceProxy>
 ChromeContentBrowserClientExtensionsPart::GetVpnServiceProxy(
     content::BrowserContext* browser_context) {
+#if defined(OS_CHROMEOS)
+  chromeos::VpnService* vpn_service =
+      chromeos::VpnServiceFactory::GetForBrowserContext(browser_context);
+  if (!vpn_service)
+    return nullptr;
+  return vpn_service->GetVpnServiceProxy();
+#else
   return nullptr;
+#endif
 }
 
 void ChromeContentBrowserClientExtensionsPart::RenderProcessWillLaunch(